Merge branch 'release/1.7.0'

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "msa-auth-for-android"]
-	path = lib/msa-auth-for-android
-	url = https://github.com/SailReal/msa-auth-for-android.git
 [submodule "subsampling-scale-image-view"]
 	path = lib/subsampling-scale-image-view
 	url = https://github.com/SailReal/subsampling-scale-image-view.git

Gemfile.lock

@@ -10,24 +10,24 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.535.0)
-    aws-sdk-core (3.123.0)
+    aws-partitions (1.554.0)
+    aws-sdk-core (3.126.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.51.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    aws-sdk-kms (1.54.0)
+      aws-sdk-core (~> 3, >= 3.126.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.107.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    aws-sdk-s3 (1.112.0)
+      aws-sdk-core (~> 3, >= 3.126.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     bcrypt_pbkdf (1.1.0)
-    claide (1.0.3)
+    claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
@@ -38,19 +38,20 @@ GEM
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
-    ed25519 (1.2.4)
+    ed25519 (1.3.0)
     emoji_regex (3.2.3)
-    excon (0.88.0)
-    faraday (1.8.0)
+    excon (0.91.0)
+    faraday (1.9.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
       faraday-patron (~> 1.0)
       faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
@@ -59,14 +60,17 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.5)
-    fastlane (2.198.1)
+    fastimage (2.2.6)
+    fastlane (2.204.3)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -111,9 +115,9 @@ GEM
       mime-types (~> 3.3)
     fastlane-plugin-get_version_name (0.2.2)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.13.0)
+    google-apis-androidpublisher_v3 (0.16.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.1)
+    google-apis-core (0.4.2)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -122,27 +126,27 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.8.0)
+    google-apis-iamcredentials_v1 (0.10.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.6.0)
+    google-apis-playcustomapp_v1 (0.7.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.9.0)
+    google-apis-storage_v1 (0.11.0)
       google-apis-core (>= 0.4, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.5.0)
       faraday (>= 0.17.3, < 2.0)
     google-cloud-errors (1.2.0)
-    google-cloud-storage (1.34.1)
-      addressable (~> 2.5)
+    google-cloud-storage (1.36.1)
+      addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
       google-apis-storage_v1 (~> 0.1)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.1.0)
+    googleauth (1.1.1)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -153,13 +157,13 @@ GEM
     http-cookie (1.0.4)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    jmespath (1.4.0)
+    jmespath (1.6.0)
     json (2.6.1)
     jwt (2.3.0)
     memoist (0.16.2)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.1115)
+    mime-types-data (3.2022.0105)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
     multi_json (1.15.0)

build.gradle

@@ -2,13 +2,13 @@ apply from: 'buildsystem/dependencies.gradle'
 apply plugin: "com.vanniktech.android.junit.jacoco"
 
 buildscript {
-	ext.kotlin_version = '1.6.0'
+	ext.kotlin_version = '1.6.10'
 	repositories {
 		mavenCentral()
 		google()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:7.0.3'
+		classpath 'com.android.tools.build:gradle:7.1.1'
 		classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0'
 		classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.16.0'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -39,16 +39,13 @@ allprojects {
 	ext {
 		androidApplicationId = 'org.cryptomator'
 		androidVersionCode = getVersionCode()
-		androidVersionName = '1.6.8'
+		androidVersionName = '1.7.0'
 	}
 	repositories {
 		mavenCentral()
 		maven {
 			url "https://maven.google.com"
 		}
-		flatDir {
-			dirs '../libs'
-		}
 		google()
 	}
 }

buildsystem/dependencies.gradle

@@ -2,12 +2,25 @@ allprojects {
 	repositories {
 		mavenCentral()
 		maven { url 'https://jitpack.io' }
+		// needed for 'com.microsoft.device.display' required by 'com.microsoft.graph:microsoft-graph'
+		exclusiveContent {
+			forRepository {
+				maven {
+					url 'https://pkgs.dev.azure.com/MicrosoftDeviceSDK/DuoSDK-Public/_packaging/Duo-SDK-Feed/maven/v1'
+					name 'Duo-SDK-Feed'
+				}
+			}
+			filter {
+				// this repository *only* contains artifacts with group "com.microsoft.device.display"
+				includeGroup "com.microsoft.device.display"
+			}
+		}
 	}
 }
 
 ext {
-	androidBuildToolsVersion = "30.0.2"
-	androidMinSdkVersion = 24
+	androidBuildToolsVersion = "30.0.3"
+	androidMinSdkVersion = 26
 	androidTargetSdkVersion = 30
 	androidCompileSdkVersion = 30
 
@@ -29,11 +42,11 @@ ext {
 	rxAndroidVersion = '2.1.1'
 	rxBindingVersion = '2.2.0'
 
-	daggerVersion = '2.40.2'
+	daggerVersion = '2.40.5'
 
-	gsonVersion = '2.8.9'
+	gsonVersion = '2.9.0'
 
-	okHttpVersion = '4.9.2'
+	okHttpVersion = '4.9.3'
 	okHttpDigestVersion = '2.6'
 
 	velocityVersion = '2.3'
@@ -52,20 +65,21 @@ ext {
 	// cloud provider libs
 	cryptolibVersion = '2.0.2'
 
-	dropboxVersion = '5.0.0'
+	dropboxVersion = '5.1.1'
 
-	googleApiServicesVersion = 'v3-rev20210919-1.32.1'
+	googleApiServicesVersion = 'v3-rev20220110-1.32.1'
 	googlePlayServicesVersion = '19.2.0'
-	googleClientVersion = '1.32.1' // keep in sync with https://github.com/SailReal/google-http-java-client
+	googleClientVersion = '1.33.2' // keep in sync with https://github.com/SailReal/google-http-java-client
 	/*
 		update using https://github.com/SailReal/google-http-java-client with `mvn clean install`,
 		copying `google-http-client-*.jar` and `google-http-client-android-*.jar` into the lib folder of this project
 	 */
-	trackingFreeGoogleCLientVersion = '1.40.1'
+	trackingFreeGoogleCLientVersion = '1.41.4'
 
-	msgraphVersion = '2.10.0'
+	msgraphVersion = '5.14.0'
+	msgraphAuthVersion = '2.2.3'
 
-	minIoVersion = '8.3.3'
+	minIoVersion = '8.3.6'
 	staxVersion = '1.2.0' // needed for minIO
 
 	commonsCodecVersion = '1.15'
@@ -76,7 +90,7 @@ ext {
 
 	jUnitVersion = '5.8.2'
 	assertJVersion = '1.7.1'
-	mockitoVersion = '4.1.0'
+	mockitoVersion = '4.3.1'
 	mockitoKotlinVersion = '4.0.0'
 	hamcrestVersion = '1.3'
 	dexmakerVersion = '1.0'
@@ -139,6 +153,7 @@ ext {
 			mockitoInline         : "org.mockito:mockito-inline:${mockitoVersion}",
 			mockitoKotlin         : "org.mockito.kotlin:mockito-kotlin:${mockitoKotlinVersion}",
 			msgraph               : "com.microsoft.graph:microsoft-graph:${msgraphVersion}",
+			msgraphAuth           : "com.microsoft.identity.client:msal:${msgraphAuthVersion}",
 			multidex              : "androidx.multidex:multidex:${multidexVersion}",
 			okHttp                : "com.squareup.okhttp3:okhttp:${okHttpVersion}",
 			okHttpDigest          : "io.github.rburgst:okhttp-digest:${okHttpDigestVersion}",

data/build.gradle

@@ -4,8 +4,6 @@ apply plugin: 'kotlin-android'
 apply plugin: 'de.mannodermaus.android-junit5'
 
 android {
-	defaultPublishConfig "debug"
-
 	def globalConfiguration = rootProject.extensions.getByName("ext")
 
 	compileSdkVersion globalConfiguration["androidCompileSdkVersion"]
@@ -28,11 +26,6 @@ android {
 		coreLibraryDesugaringEnabled true
 	}
 
-	lintOptions {
-		quiet true
-		abortOnError false
-		ignoreWarnings true
-	}
 
 	buildTypes {
 		release {
@@ -75,14 +68,21 @@ android {
 			java.srcDirs = ['src/main/java', 'src/main/java/', 'src/foss/java', 'src/foss/java/']
 		}
 	}
-
 	packagingOptions {
-		exclude 'META-INF/DEPENDENCIES'
+		resources {
+			excludes += ['META-INF/DEPENDENCIES', 'META-INF/NOTICE.md', 'META-INF/INDEX.LIST']
+		}
+	}
+
+	lint {
+		abortOnError false
+		ignoreWarnings true
+		quiet true
 	}
 }
 
 greendao {
-	schemaVersion 10
+	schemaVersion 11
 }
 
 configurations.all {
@@ -95,7 +95,6 @@ dependencies {
 
 	implementation project(':domain')
 	implementation project(':util')
-	implementation project(':msa-auth-for-android')
 	implementation project(':pcloud-sdk-java')
 
 	coreLibraryDesugaring dependencies.coreDesugaring
@@ -115,6 +114,7 @@ dependencies {
 
 	// cloud
 	implementation dependencies.dropbox
+	implementation dependencies.msgraphAuth
 	implementation dependencies.msgraph
 
 	implementation dependencies.stax