From ce584c1c9535eb512c69efdf0b0e600ef21ced62 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 4 May 2021 16:52:41 -0500 Subject: [PATCH] Update third party dependencies --- app/build.gradle.kts | 8 +++---- buildSrc/src/main/kotlin/Versions.kt | 2 +- deps_fdroid.txt | 30 +++++++++++++------------- deps_googleplay.txt | 32 ++++++++++++++-------------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index acc3cf1d7..14ef76d80 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -215,8 +215,8 @@ dependencies { } implementation("me.leolin:ShortcutBadger:1.1.22@aar") implementation("com.google.apis:google-api-services-tasks:v1-rev20210109-1.31.0") - implementation("com.google.apis:google-api-services-drive:v3-rev20210315-1.31.0") - implementation("com.google.auth:google-auth-library-oauth2-http:0.25.4") + implementation("com.google.apis:google-api-services-drive:v3-rev20210419-1.31.0") + implementation("com.google.auth:google-auth-library-oauth2-http:0.25.5") implementation("androidx.work:work-runtime:${Versions.work}") implementation("androidx.work:work-runtime-ktx:${Versions.work}") implementation("com.etesync:journalmanager:1.1.1") @@ -229,7 +229,7 @@ dependencies { implementation("androidx.compose.foundation:foundation:${Versions.compose}") implementation("androidx.compose.material:material:${Versions.compose}") implementation("androidx.compose.runtime:runtime-livedata:${Versions.compose}") - implementation("com.google.android.material:compose-theme-adapter:1.0.0-beta04") + implementation("com.google.android.material:compose-theme-adapter:${Versions.compose}") implementation("androidx.activity:activity-compose:1.3.0-alpha07") releaseCompileOnly("androidx.compose.ui:ui-tooling:${Versions.compose}") @@ -239,7 +239,7 @@ dependencies { } googleplayImplementation("com.google.firebase:firebase-config-ktx:${Versions.remote_config}") googleplayImplementation("com.google.android.gms:play-services-location:18.0.0") - googleplayImplementation("com.google.android.gms:play-services-maps:17.0.0") + googleplayImplementation("com.google.android.gms:play-services-maps:17.0.1") googleplayImplementation("com.android.billingclient:billing-ktx:3.0.3") androidTestImplementation("com.google.dagger:hilt-android-testing:${Versions.hilt}") diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 42f99c5d6..8cd7a7115 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -13,7 +13,7 @@ object Versions { const val mockito = "3.9.0" const val androidx_test = "1.3.0" const val make_it_easy = "4.0.1" - const val hilt = "2.34.1-beta" + const val hilt = "2.35.1" const val hilt_androidx = "1.0.0-beta01" const val lifecycle = "2.3.0" const val markwon = "4.6.2" diff --git a/deps_fdroid.txt b/deps_fdroid.txt index eaa42b8ea..6fa5b0f4b 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -216,12 +216,12 @@ +| +--- org.dmfs:lib-recur:0.11.4 +| | \--- org.dmfs:rfc5545-datetime:0.2.4 +| \--- org.dmfs:jems:1.33 -++--- com.google.dagger:hilt-android:2.34.1-beta -+| +--- com.google.dagger:dagger:2.34.1 +++--- com.google.dagger:hilt-android:2.35.1 ++| +--- com.google.dagger:dagger:2.35.1 +| | \--- javax.inject:javax.inject:1 -+| +--- com.google.dagger:dagger-lint-aar:2.34.1 -+| +--- com.google.dagger:hilt-core:2.34.1-beta -+| | +--- com.google.dagger:dagger:2.34.1 (*) ++| +--- com.google.dagger:dagger-lint-aar:2.35.1 ++| +--- com.google.dagger:hilt-core:2.35.1 ++| | +--- com.google.dagger:dagger:2.35.1 (*) +| | \--- javax.inject:javax.inject:1 +| +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha07 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 @@ -234,7 +234,7 @@ ++--- androidx.hilt:hilt-work:1.0.0-beta01 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| +--- androidx.hilt:hilt-common:1.0.0-beta01 -+| | \--- com.google.dagger:hilt-core:2.33-beta -> 2.34.1-beta (*) ++| | \--- com.google.dagger:hilt-core:2.33-beta -> 2.35.1 (*) +| +--- androidx.work:work-runtime:2.3.4 -> 2.5.0 +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.2.0 (*) @@ -252,7 +252,7 @@ +| | +--- androidx.sqlite:sqlite-framework:2.1.0 (*) +| | +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) +| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*) -+| \--- com.google.dagger:hilt-android:2.33-beta -> 2.34.1-beta (*) ++| \--- com.google.dagger:hilt-android:2.33-beta -> 2.35.1 (*) ++--- androidx.fragment:fragment-ktx:1.3.2 +| +--- androidx.fragment:fragment:1.3.2 (*) +| +--- androidx.activity:activity-ktx:1.2.2 -> 1.3.0-alpha07 @@ -351,11 +351,11 @@ +| | | \--- com.google.guava:guava:29.0-android -> 30.1.1-android (*) +| | \--- com.google.guava:guava:30.0-android -> 30.1.1-android (*) +| \--- com.google.guava:guava:29.0-android -> 30.1.1-android (*) -++--- com.google.apis:google-api-services-drive:v3-rev20210315-1.31.0 +++--- com.google.apis:google-api-services-drive:v3-rev20210419-1.31.0 +| \--- com.google.api-client:google-api-client:1.31.1 (*) -++--- com.google.auth:google-auth-library-oauth2-http:0.25.4 -+| +--- com.google.auto.value:auto-value-annotations:1.8 -+| +--- com.google.auth:google-auth-library-credentials:0.25.4 +++--- com.google.auth:google-auth-library-oauth2-http:0.25.5 ++| +--- com.google.auto.value:auto-value-annotations:1.8.1 ++| +--- com.google.auth:google-auth-library-credentials:0.25.5 +| +--- com.google.http-client:google-http-client:1.39.2 (*) +| +--- com.google.http-client:google-http-client-gson:1.39.2 +| | +--- com.google.http-client:google-http-client:1.39.2 (*) @@ -497,13 +497,13 @@ +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) +| \--- androidx.compose.ui:ui:1.0.0-beta05 (*) -++--- com.google.android.material:compose-theme-adapter:1.0.0-beta04 +++--- com.google.android.material:compose-theme-adapter:1.0.0-beta05 +| +--- androidx.appcompat:appcompat:1.3.0-beta01 -> 1.3.0-rc01 (*) +| +--- androidx.core:core-ktx:1.3.1 -> 1.3.2 (*) -+| +--- androidx.compose.runtime:runtime:1.0.0-beta04 -> 1.0.0-beta05 (*) -+| +--- androidx.compose.material:material:1.0.0-beta04 -> 1.0.0-beta05 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| +--- androidx.compose.material:material:1.0.0-beta05 (*) +| +--- com.google.android.material:material:1.1.0 -> 1.3.0 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) +\--- androidx.activity:activity-compose:1.3.0-alpha07 + +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) + +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta05 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index fc3b1000c..3e1d3b1c5 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -216,7 +216,7 @@ +| +--- com.google.android.gms:play-services-places-placereport:17.0.0 +| | \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) +| \--- com.google.android.gms:play-services-tasks:17.1.0 -> 17.2.0 (*) -++--- com.google.android.gms:play-services-maps:17.0.0 +++--- com.google.android.gms:play-services-maps:17.0.1 +| +--- androidx.fragment:fragment:1.0.0 -> 1.3.2 (*) +| +--- com.google.android.gms:play-services-base:17.0.0 -> 17.5.0 (*) +| \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) @@ -333,12 +333,12 @@ +| +--- org.dmfs:lib-recur:0.11.4 +| | \--- org.dmfs:rfc5545-datetime:0.2.4 +| \--- org.dmfs:jems:1.33 -++--- com.google.dagger:hilt-android:2.34.1-beta -+| +--- com.google.dagger:dagger:2.34.1 +++--- com.google.dagger:hilt-android:2.35.1 ++| +--- com.google.dagger:dagger:2.35.1 +| | \--- javax.inject:javax.inject:1 -+| +--- com.google.dagger:dagger-lint-aar:2.34.1 -+| +--- com.google.dagger:hilt-core:2.34.1-beta -+| | +--- com.google.dagger:dagger:2.34.1 (*) ++| +--- com.google.dagger:dagger-lint-aar:2.35.1 ++| +--- com.google.dagger:hilt-core:2.35.1 ++| | +--- com.google.dagger:dagger:2.35.1 (*) +| | \--- javax.inject:javax.inject:1 +| +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha07 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 @@ -351,7 +351,7 @@ ++--- androidx.hilt:hilt-work:1.0.0-beta01 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| +--- androidx.hilt:hilt-common:1.0.0-beta01 -+| | \--- com.google.dagger:hilt-core:2.33-beta -> 2.34.1-beta (*) ++| | \--- com.google.dagger:hilt-core:2.33-beta -> 2.35.1 (*) +| +--- androidx.work:work-runtime:2.3.4 -> 2.5.0 +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.2.0 (*) @@ -369,7 +369,7 @@ +| | +--- androidx.sqlite:sqlite-framework:2.1.0 (*) +| | +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) +| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*) -+| \--- com.google.dagger:hilt-android:2.33-beta -> 2.34.1-beta (*) ++| \--- com.google.dagger:hilt-android:2.33-beta -> 2.35.1 (*) ++--- androidx.fragment:fragment-ktx:1.3.2 +| +--- androidx.fragment:fragment:1.3.2 (*) +| +--- androidx.activity:activity-ktx:1.2.2 -> 1.3.0-alpha07 @@ -468,11 +468,11 @@ +| | | \--- com.google.guava:guava:29.0-android -> 30.1.1-android (*) +| | \--- com.google.guava:guava:30.0-android -> 30.1.1-android (*) +| \--- com.google.guava:guava:29.0-android -> 30.1.1-android (*) -++--- com.google.apis:google-api-services-drive:v3-rev20210315-1.31.0 +++--- com.google.apis:google-api-services-drive:v3-rev20210419-1.31.0 +| \--- com.google.api-client:google-api-client:1.31.1 (*) -++--- com.google.auth:google-auth-library-oauth2-http:0.25.4 -+| +--- com.google.auto.value:auto-value-annotations:1.8 -+| +--- com.google.auth:google-auth-library-credentials:0.25.4 +++--- com.google.auth:google-auth-library-oauth2-http:0.25.5 ++| +--- com.google.auto.value:auto-value-annotations:1.8.1 ++| +--- com.google.auth:google-auth-library-credentials:0.25.5 +| +--- com.google.http-client:google-http-client:1.39.2 (*) +| +--- com.google.http-client:google-http-client-gson:1.39.2 +| | +--- com.google.http-client:google-http-client:1.39.2 (*) @@ -614,13 +614,13 @@ +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) +| \--- androidx.compose.ui:ui:1.0.0-beta05 (*) -++--- com.google.android.material:compose-theme-adapter:1.0.0-beta04 +++--- com.google.android.material:compose-theme-adapter:1.0.0-beta05 +| +--- androidx.appcompat:appcompat:1.3.0-beta01 -> 1.3.0-rc01 (*) +| +--- androidx.core:core-ktx:1.3.1 -> 1.3.2 (*) -+| +--- androidx.compose.runtime:runtime:1.0.0-beta04 -> 1.0.0-beta05 (*) -+| +--- androidx.compose.material:material:1.0.0-beta04 -> 1.0.0-beta05 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| +--- androidx.compose.material:material:1.0.0-beta05 (*) +| +--- com.google.android.material:material:1.1.0 -> 1.3.0 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) +\--- androidx.activity:activity-compose:1.3.0-alpha07 + +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) + +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta05 (*)