diff --git a/Gemfile.lock b/Gemfile.lock index e21da107..c8545b12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,17 +10,17 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.554.0) - aws-sdk-core (3.126.1) + aws-partitions (1.571.0) + aws-sdk-core (3.130.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.54.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-kms (1.55.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.112.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-s3 (1.113.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sigv4 (1.4.0) @@ -40,8 +40,8 @@ GEM dotenv (2.7.6) ed25519 (1.3.0) emoji_regex (3.2.3) - excon (0.91.0) - faraday (1.9.3) + excon (0.92.1) + faraday (1.10.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -70,7 +70,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.6) - fastlane (2.204.3) + fastlane (2.205.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -109,13 +109,13 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) - fastlane-plugin-aws_s3 (2.0.3) + fastlane-plugin-aws_s3 (2.1.0) apktools (~> 0.7) aws-sdk-s3 (~> 1) mime-types (~> 3.3) fastlane-plugin-get_version_name (0.2.2) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.16.0) + google-apis-androidpublisher_v3 (0.17.0) google-apis-core (>= 0.4, < 2.a) google-apis-core (0.4.2) addressable (~> 2.5, >= 2.5.1) @@ -135,8 +135,8 @@ GEM 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-env (1.6.0) + faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.2.0) google-cloud-storage (1.36.1) addressable (~> 2.8) @@ -146,8 +146,8 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.1.1) - faraday (>= 0.17.3, < 2.0) + googleauth (1.1.2) + faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) @@ -157,7 +157,7 @@ GEM http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) - jmespath (1.6.0) + jmespath (1.6.1) json (2.6.1) jwt (2.3.0) memoist (0.16.2) @@ -188,9 +188,9 @@ GEM ruby2_keywords (0.0.5) rubyzip (2.3.2) security (0.1.3) - signet (0.16.0) + signet (0.16.1) addressable (~> 2.8) - faraday (>= 0.17.3, < 2.0) + faraday (>= 0.17.5, < 3.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simctl (1.6.8) @@ -207,7 +207,7 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.8) + unf_ext (0.0.8.1) unicode-display_width (1.8.0) webrick (1.7.0) word_wrap (1.0.0) diff --git a/build.gradle b/build.gradle index 34c042bd..8e6d8d2b 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.1' + classpath 'com.android.tools.build:gradle:7.1.2' 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" diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle index 7e5d3df5..bf121eef 100644 --- a/buildsystem/dependencies.gradle +++ b/buildsystem/dependencies.gradle @@ -42,7 +42,7 @@ ext { rxAndroidVersion = '2.1.1' rxBindingVersion = '2.2.0' - daggerVersion = '2.40.5' + daggerVersion = '2.41' gsonVersion = '2.9.0' @@ -69,17 +69,17 @@ ext { googleApiServicesVersion = 'v3-rev20220110-1.32.1' googlePlayServicesVersion = '19.2.0' - googleClientVersion = '1.33.2' // keep in sync with https://github.com/SailReal/google-http-java-client + googleClientVersion = '1.33.4' // 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.41.4' + trackingFreeGoogleCLientVersion = '1.41.5' - msgraphVersion = '5.14.0' - msgraphAuthVersion = '2.2.3' + msgraphVersion = '5.17.0' + msgraphAuthVersion = '3.0.2' - minIoVersion = '8.3.6' + minIoVersion = '8.3.7' staxVersion = '1.2.0' // needed for minIO commonsCodecVersion = '1.15' @@ -90,7 +90,7 @@ ext { jUnitVersion = '5.8.2' assertJVersion = '1.7.1' - mockitoVersion = '4.3.1' + mockitoVersion = '4.4.0' mockitoKotlinVersion = '4.0.0' hamcrestVersion = '1.3' dexmakerVersion = '1.0' diff --git a/data/src/main/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepository.kt b/data/src/main/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepository.kt index 2832a50d..4fb6e4f4 100644 --- a/data/src/main/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepository.kt +++ b/data/src/main/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepository.kt @@ -4,7 +4,7 @@ import android.content.Context import com.microsoft.graph.core.GraphErrorCodes import com.microsoft.graph.http.GraphServiceException import com.microsoft.graph.requests.GraphServiceClient -import com.microsoft.identity.common.exception.ClientException +import com.microsoft.identity.common.java.exception.ClientException import org.cryptomator.data.cloud.InterceptingCloudContentRepository import org.cryptomator.domain.OnedriveCloud import org.cryptomator.domain.exception.BackendException diff --git a/lib/google-http-client-1.41.5.jar b/lib/google-http-client-1.41.5.jar new file mode 100644 index 00000000..ba559042 Binary files /dev/null and b/lib/google-http-client-1.41.5.jar differ diff --git a/lib/google-http-client-android-1.41.5.jar b/lib/google-http-client-android-1.41.5.jar new file mode 100644 index 00000000..8155cb61 Binary files /dev/null and b/lib/google-http-client-android-1.41.5.jar differ diff --git a/lib/pcloud-sdk-java b/lib/pcloud-sdk-java index dc4d0897..4834dde9 160000 --- a/lib/pcloud-sdk-java +++ b/lib/pcloud-sdk-java @@ -1 +1 @@ -Subproject commit dc4d0897f7917f026376d35f9a6eaf6edbc7115d +Subproject commit 4834dde955127b1760be9bb527e9d45613b1f036