diff --git a/build.gradle b/build.gradle index d3ef45a8..a7a365c3 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.0' + 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" diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle index db3b501f..364ce24d 100644 --- a/buildsystem/dependencies.gradle +++ b/buildsystem/dependencies.gradle @@ -46,7 +46,7 @@ ext { gsonVersion = '2.8.9' - okHttpVersion = '4.9.2' + okHttpVersion = '4.9.3' okHttpDigestVersion = '2.6' velocityVersion = '2.3' @@ -67,19 +67,19 @@ ext { dropboxVersion = '5.1.1' - googleApiServicesVersion = 'v3-rev20210919-1.32.1' + googleApiServicesVersion = 'v3-rev20220110-1.32.1' googlePlayServicesVersion = '19.2.0' - googleClientVersion = '1.33.0' // 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.41.1' + trackingFreeGoogleCLientVersion = '1.41.4' - msgraphVersion = '5.12.0' + msgraphVersion = '5.14.0' msgraphAuthVersion = '2.2.3' - minIoVersion = '8.3.5' + minIoVersion = '8.3.6' 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.2.0' + mockitoVersion = '4.3.1' mockitoKotlinVersion = '4.0.0' hamcrestVersion = '1.3' dexmakerVersion = '1.0' diff --git a/lib/google-http-client-1.41.1.jar b/lib/google-http-client-1.41.4.jar similarity index 86% rename from lib/google-http-client-1.41.1.jar rename to lib/google-http-client-1.41.4.jar index 6c7e3d70..5f98cfce 100644 Binary files a/lib/google-http-client-1.41.1.jar and b/lib/google-http-client-1.41.4.jar differ diff --git a/lib/google-http-client-android-1.41.1.jar b/lib/google-http-client-android-1.41.4.jar similarity index 70% rename from lib/google-http-client-android-1.41.1.jar rename to lib/google-http-client-android-1.41.4.jar index c7cf44b8..48c511b4 100644 Binary files a/lib/google-http-client-android-1.41.1.jar and b/lib/google-http-client-android-1.41.4.jar differ diff --git a/lib/pcloud-sdk-java b/lib/pcloud-sdk-java index c9615593..dc4d0897 160000 --- a/lib/pcloud-sdk-java +++ b/lib/pcloud-sdk-java @@ -1 +1 @@ -Subproject commit c961559344afe200a576b2ec5288a95c06876a4d +Subproject commit dc4d0897f7917f026376d35f9a6eaf6edbc7115d diff --git a/presentation/build.gradle b/presentation/build.gradle index 43b5e91e..c3bef375 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -105,7 +105,7 @@ android { } packagingOptions { resources { - excludes += ['META-INF/jersey-module-version', 'META-INF/NOTICE.md', 'META-INF/DEPENDENCIES'] + excludes += ['META-INF/jersey-module-version', 'META-INF/NOTICE.md', 'META-INF/DEPENDENCIES', 'META-INF/INDEX.LIST'] } }