From b569534697e0b3eb280260470b2b21fc2aedb49e Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 10 Nov 2020 13:36:54 -0600 Subject: [PATCH] Update third party dependencies --- app/build.gradle.kts | 20 +++---- build.gradle.kts | 4 +- buildSrc/src/main/kotlin/Versions.kt | 4 +- deps_fdroid.txt | 28 ++++----- deps_googleplay.txt | 86 ++++++++++++++-------------- 5 files changed, 70 insertions(+), 72 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ae5654838..d8287fd5a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -4,8 +4,8 @@ plugins { id("com.google.firebase.crashlytics") kotlin("android") kotlin("kapt") - id("com.cookpad.android.plugin.license-tools") version "1.2.2" - id("com.github.ben-manes.versions") version "0.33.0" + id("com.cookpad.android.plugin.license-tools") version "1.2.5" + id("com.github.ben-manes.versions") version "0.36.0" id("com.vanniktech.android.junit.jacoco") version "0.16.0" id("dagger.hilt.android.plugin") } @@ -138,7 +138,7 @@ val genericImplementation by configurations val googleplayImplementation by configurations dependencies { - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.0.10") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.0") implementation("com.gitlab.bitfireAT:dav4jvm:2.1.1") implementation("com.gitlab.bitfireAT:ical4android:e4c50b3485") implementation("com.gitlab.bitfireAT:cert4android:72cf235ad9") @@ -177,7 +177,7 @@ dependencies { implementation("com.google.code.gson:gson:2.8.6") implementation("com.google.android.material:material:1.2.1") implementation("androidx.annotation:annotation:1.1.0") - implementation("androidx.constraintlayout:constraintlayout:2.0.2") + implementation("androidx.constraintlayout:constraintlayout:2.0.4") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("androidx.preference:preference:1.1.1") implementation("com.jakewharton.timber:timber:4.7.1") @@ -194,11 +194,11 @@ dependencies { implementation("com.wdullaer:materialdatetimepicker:4.2.3") implementation("me.leolin:ShortcutBadger:1.1.22@aar") implementation("com.google.apis:google-api-services-tasks:v1-rev20200905-1.30.10") - implementation("com.google.apis:google-api-services-drive:v3-rev20200813-1.30.10") - implementation("com.google.auth:google-auth-library-oauth2-http:0.21.1") + implementation("com.google.apis:google-api-services-drive:v3-rev20201101-1.30.10") + implementation("com.google.auth:google-auth-library-oauth2-http:0.22.0") implementation("androidx.work:work-runtime:${Versions.work}") implementation("androidx.work:work-runtime-ktx:${Versions.work}") - implementation("com.mapbox.mapboxsdk:mapbox-android-core:3.0.0") + implementation("com.mapbox.mapboxsdk:mapbox-android-core:3.1.0") implementation("com.mapbox.mapboxsdk:mapbox-sdk-services:5.3.0") implementation("com.etesync:journalmanager:1.1.1") implementation("com.github.QuadFlask:colorpicker:0.0.15") @@ -214,7 +214,7 @@ dependencies { googleplayImplementation("com.google.android.gms:play-services-maps:17.0.0") googleplayImplementation("com.google.android.libraries.places:places:2.4.0") googleplayImplementation("com.android.billingclient:billing:1.2.2") - googleplayImplementation("com.google.android.gms:play-services-auth:18.1.0") + googleplayImplementation("com.google.android.gms:play-services-auth:19.0.0") androidTestImplementation("com.google.dagger:hilt-android-testing:${Versions.hilt}") kaptAndroidTest("com.google.dagger:hilt-compiler:${Versions.hilt}") @@ -227,8 +227,8 @@ dependencies { androidTestImplementation("androidx.test.ext:junit:1.1.2") androidTestImplementation("androidx.annotation:annotation:1.1.0") - testImplementation("junit:junit:4.13") - testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9") + testImplementation("junit:junit:4.13.1") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.1") testImplementation("com.natpryce:make-it-easy:${Versions.make_it_easy}") testImplementation("androidx.test:core:${Versions.androidx_test}") testImplementation("org.mockito:mockito-core:${Versions.mockito}") diff --git a/build.gradle.kts b/build.gradle.kts index 90c4553c1..2e72a26f7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,8 +6,8 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:4.1.1") - classpath("com.google.gms:google-services:4.3.3") - classpath("com.google.firebase:firebase-crashlytics-gradle:2.2.1") + classpath("com.google.gms:google-services:4.3.4") + classpath("com.google.firebase:firebase-crashlytics-gradle:2.3.0") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}") classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.hilt}") } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 770f91051..6168d631f 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -7,8 +7,8 @@ object Versions { const val leakcanary = "2.5" const val room = "2.2.5" const val crashlytics = "17.2.2" - const val analytics = "17.6.0" - const val remote_config = "19.2.0" + const val analytics = "18.0.0" + const val remote_config = "20.0.0" const val okhttp = "4.8.1" const val flipper = "0.64.0" const val mockito = "3.3.3" diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 09c10bac6..29b77bc5f 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -26,7 +26,7 @@ +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.4.10 (*) +| | +--- com.google.code.gson:gson:2.8.5 -> 2.8.6 +| | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | +--- com.mapbox.mapboxsdk:mapbox-android-core:3.0.0 ++| | +--- com.mapbox.mapboxsdk:mapbox-android-core:3.0.0 -> 3.1.0 +| | \--- androidx.legacy:legacy-support-core-utils:1.0.0 +| | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| | +--- androidx.core:core:1.0.0 -> 1.3.2 @@ -301,10 +301,10 @@ ++--- com.google.code.gson:gson:2.8.6 ++--- com.google.android.material:material:1.2.1 (*) ++--- androidx.annotation:annotation:1.1.0 -++--- androidx.constraintlayout:constraintlayout:2.0.2 +++--- androidx.constraintlayout:constraintlayout:2.0.4 +| +--- androidx.appcompat:appcompat:1.2.0 (*) +| +--- androidx.core:core:1.3.1 -> 1.3.2 (*) -+| \--- androidx.constraintlayout:constraintlayout-solver:2.0.2 ++| \--- androidx.constraintlayout:constraintlayout-solver:2.0.4 ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 +| +--- androidx.annotation:annotation:1.1.0 +| +--- androidx.core:core:1.1.0 -> 1.3.2 (*) @@ -329,7 +329,7 @@ ++--- com.google.apis:google-api-services-tasks:v1-rev20200905-1.30.10 +| \--- com.google.api-client:google-api-client:1.30.10 +| +--- com.google.oauth-client:google-oauth-client:1.31.0 -+| | +--- com.google.http-client:google-http-client:1.35.0 -> 1.36.0 ++| | +--- com.google.http-client:google-http-client:1.35.0 -> 1.37.0 +| | | +--- org.apache.httpcomponents:httpcore:4.4.13 +| | | +--- com.google.guava:guava:29.0-android +| | | | +--- com.google.guava:failureaccess:1.0.1 @@ -340,24 +340,24 @@ +| | | +--- io.opencensus:opencensus-api:0.24.0 (*) +| | | \--- com.google.guava:guava:26.0-android -> 29.0-android (*) +| | \--- com.google.guava:guava:29.0-android (*) -+| +--- com.google.http-client:google-http-client-jackson2:1.36.0 -+| | +--- com.google.http-client:google-http-client:1.36.0 (*) -+| | \--- com.fasterxml.jackson.core:jackson-core:2.11.1 ++| +--- com.google.http-client:google-http-client-jackson2:1.36.0 -> 1.37.0 ++| | +--- com.google.http-client:google-http-client:1.37.0 (*) ++| | \--- com.fasterxml.jackson.core:jackson-core:2.11.3 +| \--- com.google.guava:guava:29.0-android (*) -++--- com.google.apis:google-api-services-drive:v3-rev20200813-1.30.10 +++--- com.google.apis:google-api-services-drive:v3-rev20201101-1.30.10 +| \--- com.google.api-client:google-api-client:1.30.10 (*) -++--- com.google.auth:google-auth-library-oauth2-http:0.21.1 -+| +--- com.google.auto.value:auto-value-annotations:1.7.2 -+| +--- com.google.auth:google-auth-library-credentials:0.21.1 -+| +--- com.google.http-client:google-http-client:1.36.0 (*) -+| +--- com.google.http-client:google-http-client-jackson2:1.36.0 (*) +++--- com.google.auth:google-auth-library-oauth2-http:0.22.0 ++| +--- com.google.auto.value:auto-value-annotations:1.7.4 ++| +--- com.google.auth:google-auth-library-credentials:0.22.0 ++| +--- com.google.http-client:google-http-client:1.37.0 (*) ++| +--- com.google.http-client:google-http-client-jackson2:1.37.0 (*) +| \--- com.google.guava:guava:29.0-android (*) ++--- androidx.work:work-runtime:2.4.0 (*) ++--- androidx.work:work-runtime-ktx:2.4.0 +| +--- androidx.work:work-runtime:2.4.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.4.10 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.4 (*) -++--- com.mapbox.mapboxsdk:mapbox-android-core:3.0.0 +++--- com.mapbox.mapboxsdk:mapbox-android-core:3.1.0 ++--- com.mapbox.mapboxsdk:mapbox-sdk-services:5.3.0 +| +--- com.mapbox.mapboxsdk:mapbox-sdk-core:5.3.0 +| | +--- com.google.code.gson:gson:2.8.6 diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 6efea4857..a12a8069a 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -106,8 +106,8 @@ +| | | \--- org.jetbrains:annotations:13.0 -> 16.0.1 +| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.4.10 +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.4.10 (*) -++--- com.google.firebase:firebase-analytics:17.6.0 -+| +--- com.google.android.gms:play-services-measurement:17.6.0 +++--- com.google.firebase:firebase-analytics:18.0.0 ++| +--- com.google.android.gms:play-services-measurement:18.0.0 +| | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | +--- androidx.legacy:legacy-support-core-utils:1.0.0 +| | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 @@ -122,62 +122,60 @@ +| | +--- com.google.android.gms:play-services-ads-identifier:17.0.0 +| | | \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) +| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-base:17.6.0 ++| | +--- com.google.android.gms:play-services-measurement-base:18.0.0 +| | | \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-impl:17.6.0 ++| | +--- com.google.android.gms:play-services-measurement-impl:18.0.0 +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | | +--- androidx.core:core:1.0.0 -> 1.3.2 (*) +| | | +--- com.google.android.gms:play-services-ads-identifier:17.0.0 (*) +| | | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| | | +--- com.google.android.gms:play-services-measurement-base:17.6.0 (*) ++| | | +--- com.google.android.gms:play-services-measurement-base:18.0.0 (*) +| | | \--- com.google.android.gms:play-services-stats:17.0.0 +| | | +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*) +| | | \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) +| | \--- com.google.android.gms:play-services-stats:17.0.0 (*) -+| +--- com.google.android.gms:play-services-measurement-api:17.6.0 ++| +--- com.google.android.gms:play-services-measurement-api:18.0.0 +| | +--- com.google.android.gms:play-services-ads-identifier:17.0.0 (*) +| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-base:17.6.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-impl:17.6.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-sdk-api:17.6.0 ++| | +--- com.google.android.gms:play-services-measurement-base:18.0.0 (*) ++| | +--- com.google.android.gms:play-services-measurement-sdk-api:18.0.0 +| | | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| | | \--- com.google.android.gms:play-services-measurement-base:17.6.0 (*) ++| | | \--- com.google.android.gms:play-services-measurement-base:18.0.0 (*) +| | +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.1.0 (*) +| | +--- com.google.firebase:firebase-common:19.3.0 -> 19.3.1 (*) +| | +--- com.google.firebase:firebase-components:16.0.0 (*) +| | +--- com.google.firebase:firebase-installations:16.3.2 -> 16.3.3 (*) +| | +--- com.google.firebase:firebase-installations-interop:16.0.0 (*) +| | \--- com.google.firebase:firebase-measurement-connector:18.0.0 (*) -+| \--- com.google.android.gms:play-services-measurement-sdk:17.6.0 ++| \--- com.google.android.gms:play-services-measurement-sdk:18.0.0 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| +--- com.google.android.gms:play-services-measurement-base:17.6.0 (*) -+| \--- com.google.android.gms:play-services-measurement-impl:17.6.0 (*) -++--- com.google.firebase:firebase-config-ktx:19.2.0 ++| +--- com.google.android.gms:play-services-measurement-base:18.0.0 (*) ++| \--- com.google.android.gms:play-services-measurement-impl:18.0.0 (*) +++--- com.google.firebase:firebase-config-ktx:20.0.0 +| +--- androidx.annotation:annotation:1.1.0 -+| +--- com.google.firebase:firebase-abt:19.1.0 ++| +--- com.google.firebase:firebase-abt:20.0.0 +| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| | +--- com.google.firebase:firebase-common:19.3.0 -> 19.3.1 (*) ++| | +--- com.google.firebase:firebase-common:19.3.1 (*) +| | +--- com.google.firebase:firebase-components:16.0.0 (*) -+| | +--- com.google.firebase:firebase-measurement-connector:18.0.0 (*) -+| | \--- com.google.protobuf:protobuf-javalite:3.11.0 -+| +--- com.google.firebase:firebase-common:19.3.0 -> 19.3.1 (*) -+| +--- com.google.firebase:firebase-common-ktx:19.3.0 ++| | \--- com.google.firebase:firebase-measurement-connector:18.0.0 (*) ++| +--- com.google.firebase:firebase-common:19.3.1 (*) ++| +--- com.google.firebase:firebase-common-ktx:19.3.1 +| | +--- androidx.annotation:annotation:1.1.0 -+| | +--- com.google.firebase:firebase-common:19.3.0 -> 19.3.1 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50 -> 1.4.10 ++| | +--- com.google.firebase:firebase-common:19.3.1 (*) ++| | +--- com.google.firebase:firebase-components:16.0.0 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.4.10 +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 (*) +| +--- com.google.firebase:firebase-components:16.0.0 (*) -+| +--- com.google.firebase:firebase-config:19.2.0 ++| +--- com.google.firebase:firebase-config:20.0.0 +| | +--- com.google.android.gms:play-services-tasks:17.0.2 -> 17.1.0 (*) -+| | +--- com.google.firebase:firebase-abt:19.1.0 (*) -+| | +--- com.google.firebase:firebase-common:19.3.0 -> 19.3.1 (*) ++| | +--- com.google.firebase:firebase-abt:20.0.0 (*) ++| | +--- com.google.firebase:firebase-common:19.3.1 (*) +| | +--- com.google.firebase:firebase-components:16.0.0 (*) -+| | +--- com.google.firebase:firebase-installations:16.3.2 -> 16.3.3 (*) ++| | +--- com.google.firebase:firebase-installations:16.3.3 (*) +| | +--- com.google.firebase:firebase-installations-interop:16.0.0 (*) -+| | +--- com.google.firebase:firebase-measurement-connector:18.0.0 (*) -+| | \--- com.google.protobuf:protobuf-javalite:3.11.0 -+| +--- com.google.firebase:firebase-installations:16.3.2 -> 16.3.3 (*) ++| | \--- com.google.firebase:firebase-measurement-connector:18.0.0 (*) ++| +--- com.google.firebase:firebase-installations:16.3.3 (*) +| +--- com.google.firebase:firebase-installations-interop:16.0.0 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.4.10 (*) ++--- com.google.android.gms:play-services-location:17.1.0 @@ -249,10 +247,10 @@ +| +--- com.google.android.gms:play-services-location:17.0.0 -> 17.1.0 (*) +| +--- com.google.android.gms:play-services-maps:17.0.0 (*) +| +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.1.0 (*) -+| +--- com.google.auto.value:auto-value-annotations:1.6.2 -> 1.7.2 ++| +--- com.google.auto.value:auto-value-annotations:1.6.2 -> 1.7.4 +| \--- com.google.code.gson:gson:2.8.5 -> 2.8.6 ++--- com.android.billingclient:billing:1.2.2 -++--- com.google.android.gms:play-services-auth:18.1.0 +++--- com.google.android.gms:play-services-auth:19.0.0 +| +--- androidx.fragment:fragment:1.0.0 -> 1.2.5 (*) +| +--- androidx.loader:loader:1.0.0 (*) +| +--- com.google.android.gms:play-services-auth-api-phone:17.0.0 @@ -433,10 +431,10 @@ ++--- com.google.code.gson:gson:2.8.6 ++--- com.google.android.material:material:1.2.1 (*) ++--- androidx.annotation:annotation:1.1.0 -++--- androidx.constraintlayout:constraintlayout:2.0.2 +++--- androidx.constraintlayout:constraintlayout:2.0.4 +| +--- androidx.appcompat:appcompat:1.2.0 (*) +| +--- androidx.core:core:1.3.1 -> 1.3.2 (*) -+| \--- androidx.constraintlayout:constraintlayout-solver:2.0.2 ++| \--- androidx.constraintlayout:constraintlayout-solver:2.0.4 ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 +| +--- androidx.annotation:annotation:1.1.0 +| +--- androidx.core:core:1.1.0 -> 1.3.2 (*) @@ -461,7 +459,7 @@ ++--- com.google.apis:google-api-services-tasks:v1-rev20200905-1.30.10 +| \--- com.google.api-client:google-api-client:1.30.10 +| +--- com.google.oauth-client:google-oauth-client:1.31.0 -+| | +--- com.google.http-client:google-http-client:1.35.0 -> 1.36.0 ++| | +--- com.google.http-client:google-http-client:1.35.0 -> 1.37.0 +| | | +--- org.apache.httpcomponents:httpcore:4.4.13 +| | | +--- com.google.guava:guava:29.0-android +| | | | +--- com.google.guava:failureaccess:1.0.1 @@ -472,24 +470,24 @@ +| | | +--- io.opencensus:opencensus-api:0.24.0 (*) +| | | \--- com.google.guava:guava:26.0-android -> 29.0-android (*) +| | \--- com.google.guava:guava:29.0-android (*) -+| +--- com.google.http-client:google-http-client-jackson2:1.36.0 -+| | +--- com.google.http-client:google-http-client:1.36.0 (*) -+| | \--- com.fasterxml.jackson.core:jackson-core:2.11.1 ++| +--- com.google.http-client:google-http-client-jackson2:1.36.0 -> 1.37.0 ++| | +--- com.google.http-client:google-http-client:1.37.0 (*) ++| | \--- com.fasterxml.jackson.core:jackson-core:2.11.3 +| \--- com.google.guava:guava:29.0-android (*) -++--- com.google.apis:google-api-services-drive:v3-rev20200813-1.30.10 +++--- com.google.apis:google-api-services-drive:v3-rev20201101-1.30.10 +| \--- com.google.api-client:google-api-client:1.30.10 (*) -++--- com.google.auth:google-auth-library-oauth2-http:0.21.1 -+| +--- com.google.auto.value:auto-value-annotations:1.7.2 -+| +--- com.google.auth:google-auth-library-credentials:0.21.1 -+| +--- com.google.http-client:google-http-client:1.36.0 (*) -+| +--- com.google.http-client:google-http-client-jackson2:1.36.0 (*) +++--- com.google.auth:google-auth-library-oauth2-http:0.22.0 ++| +--- com.google.auto.value:auto-value-annotations:1.7.4 ++| +--- com.google.auth:google-auth-library-credentials:0.22.0 ++| +--- com.google.http-client:google-http-client:1.37.0 (*) ++| +--- com.google.http-client:google-http-client-jackson2:1.37.0 (*) +| \--- com.google.guava:guava:29.0-android (*) ++--- androidx.work:work-runtime:2.4.0 (*) ++--- androidx.work:work-runtime-ktx:2.4.0 +| +--- androidx.work:work-runtime:2.4.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.4.10 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.4 (*) -++--- com.mapbox.mapboxsdk:mapbox-android-core:3.0.0 +++--- com.mapbox.mapboxsdk:mapbox-android-core:3.1.0 ++--- com.mapbox.mapboxsdk:mapbox-sdk-services:5.3.0 +| +--- com.mapbox.mapboxsdk:mapbox-sdk-core:5.3.0 +| | +--- com.google.code.gson:gson:2.8.6