From 3e28f334158172a4b4a5c8d13ad691e1e7bb08aa Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 20 Apr 2021 15:53:21 -0500 Subject: [PATCH] Update third party dependencies --- app/build.gradle.kts | 8 +- buildSrc/src/main/kotlin/Versions.kt | 14 +- deps_fdroid.txt | 224 ++++++++++++------------ deps_googleplay.txt | 250 ++++++++++++++------------- 4 files changed, 250 insertions(+), 246 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2b3499abe..bcab74c85 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -216,8 +216,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-rev20210228-1.31.0") - implementation("com.google.auth:google-auth-library-oauth2-http:0.25.2") + 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("androidx.work:work-runtime:${Versions.work}") implementation("androidx.work:work-runtime-ktx:${Versions.work}") implementation("com.etesync:journalmanager:1.1.1") @@ -230,8 +230,8 @@ 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:${Versions.compose}") - implementation("androidx.activity:activity-compose:1.3.0-alpha05") + implementation("com.google.android.material:compose-theme-adapter:1.0.0-beta04") + implementation("androidx.activity:activity-compose:1.3.0-alpha07") releaseCompileOnly("androidx.compose.ui:ui-tooling:${Versions.compose}") googleplayImplementation("com.google.firebase:firebase-crashlytics:${Versions.crashlytics}") diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index f8dfa2f4a..42f99c5d6 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -4,18 +4,18 @@ object Versions { const val minSdk = 24 const val work = "2.5.0" const val leakcanary = "2.7" - const val room = "2.2.6" - const val crashlytics = "17.4.0" - const val analytics = "18.0.2" + const val room = "2.3.0" + const val crashlytics = "17.4.1" + const val analytics = "18.0.3" const val remote_config = "20.0.4" const val okhttp = "4.8.1" - const val flipper = "0.81.0" - const val mockito = "3.8.0" + const val flipper = "0.85.0" + 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.33-beta" + const val hilt = "2.34.1-beta" const val hilt_androidx = "1.0.0-beta01" const val lifecycle = "2.3.0" const val markwon = "4.6.2" - const val compose = "1.0.0-beta04" + const val compose = "1.0.0-beta05" } \ No newline at end of file diff --git a/deps_fdroid.txt b/deps_fdroid.txt index de68fa996..e567c6e6e 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -59,7 +59,7 @@ +| | | | | \--- androidx.arch.core:core-common:2.1.0 (*) +| | | | \--- androidx.lifecycle:lifecycle-viewmodel:2.0.0 -> 2.3.1 +| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha05 ++| | | +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha07 +| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | | | +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) +| | | | +--- androidx.lifecycle:lifecycle-runtime:2.3.1 (*) @@ -80,7 +80,7 @@ +| | | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 (*) +| | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1 (*) +| | | +--- androidx.savedstate:savedstate:1.1.0 (*) -+| | | \--- androidx.annotation:annotation-experimental:1.0.0 ++| | | \--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0 +| | +--- androidx.lifecycle:lifecycle-common:2.2.0 -> 2.3.1 (*) +| | +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| | +--- androidx.lifecycle:lifecycle-process:2.2.0 @@ -127,7 +127,7 @@ +| | +--- androidx.core:core:1.5.0-rc01 (*) +| | +--- androidx.cursoradapter:cursoradapter:1.0.0 +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha05 (*) ++| | +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha07 (*) +| | +--- androidx.fragment:fragment:1.3.2 (*) +| | +--- androidx.appcompat:appcompat-resources:1.3.0-rc01 +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) @@ -191,7 +191,7 @@ +| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| | | \--- androidx.print:print:1.0.0 +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | +--- androidx.annotation:annotation-experimental:1.0.0 ++| | +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0 +| | +--- androidx.fragment:fragment:1.0.0 -> 1.3.2 (*) +| | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.1 (*) +| | +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 @@ -216,52 +216,54 @@ +| +--- 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.33-beta -+| +--- com.google.dagger:dagger:2.33 +++--- com.google.dagger:hilt-android:2.34.1-beta ++| +--- com.google.dagger:dagger:2.34.1 +| | \--- javax.inject:javax.inject:1 -+| +--- com.google.dagger:dagger-lint-aar:2.33 -+| +--- com.google.dagger:hilt-core:2.33-beta -+| | +--- com.google.dagger:dagger:2.33 (*) ++| +--- 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 (*) +| | \--- javax.inject:javax.inject:1 -+| +--- androidx.activity:activity:1.2.0 -> 1.3.0-alpha05 (*) ++| +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha07 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- androidx.fragment:fragment:1.3.0 -> 1.3.2 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 -> 2.3.1 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0 -> 2.3.1 (*) ++| +--- androidx.fragment:fragment:1.3.2 (*) ++| +--- androidx.lifecycle:lifecycle-common:2.3.1 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1 (*) +| +--- androidx.savedstate:savedstate:1.1.0 (*) +| \--- javax.inject:javax.inject:1 ++--- 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 (*) ++| | \--- com.google.dagger:hilt-core:2.33-beta -> 2.34.1-beta (*) +| +--- 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 (*) -+| | +--- androidx.room:room-runtime:2.2.5 -> 2.2.6 -+| | | +--- androidx.room:room-common:2.2.6 ++| | +--- androidx.room:room-runtime:2.2.5 -> 2.3.0 ++| | | +--- androidx.room:room-common:2.3.0 +| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.sqlite:sqlite-framework:2.0.1 -> 2.1.0 ++| | | +--- androidx.sqlite:sqlite-framework:2.1.0 +| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| | | | \--- androidx.sqlite:sqlite:2.1.0 +| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | +--- androidx.sqlite:sqlite:2.0.1 -> 2.1.0 (*) -+| | | \--- androidx.arch.core:core-runtime:2.0.1 -> 2.1.0 (*) ++| | | +--- androidx.sqlite:sqlite:2.1.0 (*) ++| | | +--- androidx.arch.core:core-runtime:2.0.1 -> 2.1.0 (*) ++| | | \--- androidx.annotation:annotation-experimental:1.1.0 +| | +--- androidx.sqlite:sqlite:2.1.0 (*) +| | +--- 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 (*) ++| \--- com.google.dagger:hilt-android:2.33-beta -> 2.34.1-beta (*) ++--- androidx.fragment:fragment-ktx:1.3.2 +| +--- androidx.fragment:fragment:1.3.2 (*) -+| +--- androidx.activity:activity-ktx:1.2.2 -> 1.3.0-alpha05 -+| | +--- androidx.activity:activity:1.3.0-alpha05 (*) ++| +--- androidx.activity:activity-ktx:1.2.2 -> 1.3.0-alpha07 ++| | +--- androidx.activity:activity:1.3.0-alpha07 (*) +| | +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) +| | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.3.1 (*) +| | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1 (*) +| | +--- androidx.savedstate:savedstate-ktx:1.1.0 +| | | +--- androidx.savedstate:savedstate:1.1.0 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) +| +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) +| +--- androidx.collection:collection-ktx:1.1.0 +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.4.32 (*) @@ -272,11 +274,11 @@ +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*) ++--- androidx.lifecycle:lifecycle-runtime-ktx:2.3.0 -> 2.3.1 (*) ++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0 -> 2.3.1 (*) -++--- androidx.room:room-ktx:2.2.6 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.41 -> 1.4.32 (*) -+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.3 (*) -+| +--- androidx.room:room-common:2.2.6 (*) -+| \--- androidx.room:room-runtime:2.2.6 (*) +++--- androidx.room:room-ktx:2.3.0 ++| +--- androidx.room:room-common:2.3.0 (*) ++| +--- androidx.room:room-runtime:2.3.0 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) ++| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*) ++--- androidx.appcompat:appcompat:1.3.0-rc01 (*) ++--- io.reactivex.rxjava2:rxandroid:2.1.1 +| \--- io.reactivex.rxjava2:rxjava:2.2.6 @@ -338,27 +340,27 @@ ++--- com.google.apis:google-api-services-tasks:v1-rev20210109-1.31.0 +| \--- com.google.api-client:google-api-client:1.31.1 +| +--- com.google.oauth-client:google-oauth-client:1.31.2 -+| | +--- com.google.http-client:google-http-client:1.38.0 -> 1.39.1 -+| | | +--- com.google.guava:guava:30.1-android ++| | +--- com.google.http-client:google-http-client:1.38.0 -> 1.39.2 ++| | | +--- com.google.guava:guava:30.1.1-android +| | | | +--- com.google.guava:failureaccess:1.0.1 +| | | | \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava +| | | +--- io.opencensus:opencensus-api:0.28.0 +| | | | \--- io.grpc:grpc-context:1.27.2 +| | | \--- io.opencensus:opencensus-contrib-http-util:0.28.0 +| | | +--- io.opencensus:opencensus-api:0.28.0 (*) -+| | | \--- com.google.guava:guava:29.0-android -> 30.1-android (*) -+| | \--- com.google.guava:guava:30.0-android -> 30.1-android (*) -+| \--- com.google.guava:guava:29.0-android -> 30.1-android (*) -++--- com.google.apis:google-api-services-drive:v3-rev20210228-1.31.0 ++| | | \--- 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.api-client:google-api-client:1.31.1 (*) -++--- com.google.auth:google-auth-library-oauth2-http:0.25.2 -+| +--- com.google.auto.value:auto-value-annotations:1.7.4 -+| +--- com.google.auth:google-auth-library-credentials:0.25.2 -+| +--- com.google.http-client:google-http-client:1.39.1 (*) -+| +--- com.google.http-client:google-http-client-gson:1.39.1 -+| | +--- com.google.http-client:google-http-client:1.39.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.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 (*) +| | \--- com.google.code.gson:gson:2.8.6 -+| \--- com.google.guava:guava:30.1-android (*) ++| \--- com.google.guava:guava:30.1.1-android (*) ++--- androidx.work:work-runtime:2.5.0 (*) ++--- androidx.work:work-runtime-ktx:2.5.0 +| +--- androidx.work:work-runtime:2.5.0 (*) @@ -392,56 +394,56 @@ +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava ++--- org.osmdroid:osmdroid-android:6.1.10 -++--- androidx.compose.ui:ui:1.0.0-beta04 -+| +--- androidx.compose.animation:animation-core:1.0.0-beta04 +++--- androidx.compose.ui:ui:1.0.0-beta05 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta05 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3 (*) -+| | +--- androidx.compose.runtime:runtime:1.0.0-beta04 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta05 +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3 (*) +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.3 -> 0.3.4 (*) ++| | | +--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.4 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| | +--- androidx.compose.ui:ui-unit:1.0.0-beta04 -+| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta04 ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta05 ++| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta05 +| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | | +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) -+| | | | +--- androidx.compose.ui:ui-util:1.0.0-beta04 ++| | | | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| | | | +--- androidx.compose.ui:ui-util:1.0.0-beta05 +| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) +| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| | | +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) -+| | | \--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| | | \--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta04 -+| | +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) ++| +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta05 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| +--- androidx.compose.ui:ui-geometry:1.0.0-beta04 (*) -+| +--- androidx.compose.ui:ui-graphics:1.0.0-beta04 ++| +--- androidx.compose.ui:ui-geometry:1.0.0-beta05 (*) ++| +--- androidx.compose.ui:ui-graphics:1.0.0-beta05 +| | +--- androidx.annotation:annotation:1.2.0-beta01 -> 1.2.0 -+| | +--- androidx.compose.ui:ui-unit:1.0.0-beta04 (*) -+| | +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta05 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- androidx.compose.ui:ui-text:1.0.0-beta04 -+| | +--- androidx.compose.ui:ui-graphics:1.0.0-beta04 (*) -+| | +--- androidx.compose.ui:ui-unit:1.0.0-beta04 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta05 ++| | +--- androidx.compose.ui:ui-graphics:1.0.0-beta05 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta05 (*) +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| | +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) -+| | +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta04 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| | +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta05 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) +| | +--- androidx.collection:collection:1.1.0 (*) +| | \--- androidx.core:core:1.5.0-beta01 -> 1.5.0-rc01 (*) -+| +--- androidx.compose.ui:ui-unit:1.0.0-beta04 (*) ++| +--- androidx.compose.ui:ui-unit:1.0.0-beta05 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3 (*) -+| +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) -+| +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| +--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) +| +--- androidx.autofill:autofill:1.0.0 +| | \--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) @@ -449,62 +451,62 @@ +| +--- androidx.savedstate:savedstate:1.1.0 (*) +| +--- androidx.lifecycle:lifecycle-runtime:2.3.0 -> 2.3.1 (*) +| \--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 -> 2.3.1 (*) -++--- androidx.compose.foundation:foundation:1.0.0-beta04 +++--- androidx.compose.foundation:foundation:1.0.0-beta05 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- androidx.compose.animation:animation:1.0.0-beta04 ++| +--- androidx.compose.animation:animation:1.0.0-beta05 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | +--- androidx.compose.animation:animation-core:1.0.0-beta04 (*) -+| | +--- androidx.compose.foundation:foundation-layout:1.0.0-beta04 ++| | +--- androidx.compose.animation:animation-core:1.0.0-beta05 (*) ++| | +--- androidx.compose.foundation:foundation-layout:1.0.0-beta05 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.compose.ui:ui:1.0.0-beta04 (*) -+| | | +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) -+| | | +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) ++| | | +--- androidx.compose.ui:ui:1.0.0-beta05 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| | | +--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| | +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) -+| | +--- androidx.compose.ui:ui:1.0.0-beta04 (*) -+| | +--- androidx.compose.ui:ui-geometry:1.0.0-beta04 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| | +--- androidx.compose.ui:ui:1.0.0-beta05 (*) ++| | +--- androidx.compose.ui:ui-geometry:1.0.0-beta05 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) -+| +--- androidx.compose.ui:ui:1.0.0-beta04 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| +--- androidx.compose.ui:ui:1.0.0-beta05 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta04 (*) -+| +--- androidx.compose.ui:ui-text:1.0.0-beta04 (*) -+| \--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) -++--- androidx.compose.material:material:1.0.0-beta04 -+| +--- androidx.compose.animation:animation-core:1.0.0-beta04 (*) -+| +--- androidx.compose.foundation:foundation:1.0.0-beta04 (*) -+| +--- androidx.compose.material:material-icons-core:1.0.0-beta04 -+| | +--- androidx.compose.ui:ui:1.0.0-beta04 (*) ++| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta05 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta05 (*) ++| \--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) +++--- androidx.compose.material:material:1.0.0-beta05 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta05 (*) ++| +--- androidx.compose.foundation:foundation:1.0.0-beta05 (*) ++| +--- androidx.compose.material:material-icons-core:1.0.0-beta05 ++| | +--- androidx.compose.ui:ui:1.0.0-beta05 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| +--- androidx.compose.material:material-ripple:1.0.0-beta04 -+| | +--- androidx.compose.foundation:foundation:1.0.0-beta04 (*) -+| | +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) ++| +--- androidx.compose.material:material-ripple:1.0.0-beta05 ++| | +--- androidx.compose.foundation:foundation:1.0.0-beta05 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| | +--- androidx.compose.animation:animation:1.0.0-beta04 (*) -+| | \--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) -+| +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) -+| +--- androidx.compose.ui:ui:1.0.0-beta04 (*) -+| +--- androidx.compose.ui:ui-text:1.0.0-beta04 (*) ++| | +--- androidx.compose.animation:animation:1.0.0-beta05 (*) ++| | \--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| +--- androidx.compose.ui:ui:1.0.0-beta05 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta05 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- androidx.compose.animation:animation:1.0.0-beta04 (*) -+| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta04 (*) -+| \--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) -++--- androidx.compose.runtime:runtime-livedata:1.0.0-beta04 -+| +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) ++| +--- androidx.compose.animation:animation:1.0.0-beta05 (*) ++| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta05 (*) ++| \--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) +++--- androidx.compose.runtime:runtime-livedata:1.0.0-beta05 ++| +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| \--- androidx.compose.ui:ui:1.0.0-beta04 (*) ++| \--- androidx.compose.ui:ui:1.0.0-beta05 (*) ++--- com.google.android.material:compose-theme-adapter:1.0.0-beta04 +| +--- 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 (*) -+| +--- androidx.compose.material:material:1.0.0-beta04 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta04 -> 1.0.0-beta05 (*) ++| +--- androidx.compose.material:material:1.0.0-beta04 -> 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 (*) -+\--- androidx.activity:activity-compose:1.3.0-alpha05 -+ +--- androidx.compose.runtime:runtime:1.0.0-beta03 -> 1.0.0-beta04 (*) -+ +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta03 -> 1.0.0-beta04 (*) -+ +--- androidx.activity:activity-ktx:1.3.0-alpha05 (*) -+ +--- androidx.compose.ui:ui:1.0.0-beta03 -> 1.0.0-beta04 (*) -+ \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 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 (*) ++ +--- androidx.activity:activity-ktx:1.3.0-alpha07 (*) ++ +--- androidx.compose.ui:ui:1.0.0-beta05 (*) ++ \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 98ad90039..5ee50ff25 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -59,7 +59,7 @@ +| | | | | \--- androidx.arch.core:core-common:2.1.0 (*) +| | | | \--- androidx.lifecycle:lifecycle-viewmodel:2.0.0 -> 2.3.1 +| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha05 ++| | | +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha07 +| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | | | +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) +| | | | +--- androidx.lifecycle:lifecycle-runtime:2.3.1 (*) @@ -80,7 +80,7 @@ +| | | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 (*) +| | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1 (*) +| | | +--- androidx.savedstate:savedstate:1.1.0 (*) -+| | | \--- androidx.annotation:annotation-experimental:1.0.0 ++| | | \--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0 +| | +--- androidx.lifecycle:lifecycle-common:2.2.0 -> 2.3.1 (*) +| | +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| | +--- androidx.lifecycle:lifecycle-process:2.2.0 @@ -98,7 +98,7 @@ +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32 +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -++--- com.google.firebase:firebase-crashlytics:17.4.0 +++--- com.google.firebase:firebase-crashlytics:17.4.1 +| +--- com.google.android.datatransport:transport-api:2.2.1 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| +--- com.google.android.datatransport:transport-backend-cct:2.3.3 @@ -138,8 +138,8 @@ +| +--- com.google.firebase:firebase-installations-interop:16.0.1 (*) +| \--- com.google.firebase:firebase-measurement-connector:18.0.0 +| \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) -++--- com.google.firebase:firebase-analytics:18.0.2 -+| +--- com.google.android.gms:play-services-measurement:18.0.2 +++--- com.google.firebase:firebase-analytics:18.0.3 ++| +--- com.google.android.gms:play-services-measurement:18.0.3 +| | +--- 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.2.0 @@ -152,34 +152,34 @@ +| | | \--- androidx.print:print:1.0.0 +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-base:18.0.2 ++| | +--- com.google.android.gms:play-services-measurement-base:18.0.3 +| | | \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-impl:18.0.2 ++| | +--- com.google.android.gms:play-services-measurement-impl:18.0.3 +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc01 (*) +| | | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) -+| | | +--- com.google.android.gms:play-services-measurement-base:18.0.2 (*) ++| | | +--- com.google.android.gms:play-services-measurement-base:18.0.3 (*) +| | | \--- 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.5.0 (*) +| | \--- com.google.android.gms:play-services-stats:17.0.0 (*) -+| +--- com.google.android.gms:play-services-measurement-api:18.0.2 ++| +--- com.google.android.gms:play-services-measurement-api:18.0.3 +| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-base:18.0.2 (*) -+| | +--- com.google.android.gms:play-services-measurement-sdk-api:18.0.2 ++| | +--- com.google.android.gms:play-services-measurement-base:18.0.3 (*) ++| | +--- com.google.android.gms:play-services-measurement-sdk-api:18.0.3 +| | | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) -+| | | \--- com.google.android.gms:play-services-measurement-base:18.0.2 (*) ++| | | \--- com.google.android.gms:play-services-measurement-base:18.0.3 (*) +| | +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.2.0 (*) +| | +--- com.google.firebase:firebase-common:19.3.0 -> 19.5.0 (*) +| | +--- com.google.firebase:firebase-components:16.0.0 -> 16.1.0 (*) +| | +--- com.google.firebase:firebase-installations:16.3.2 -> 16.3.5 (*) +| | +--- com.google.firebase:firebase-installations-interop:16.0.0 -> 16.0.1 (*) +| | \--- com.google.firebase:firebase-measurement-connector:18.0.0 (*) -+| \--- com.google.android.gms:play-services-measurement-sdk:18.0.2 ++| \--- com.google.android.gms:play-services-measurement-sdk:18.0.3 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) -+| +--- com.google.android.gms:play-services-measurement-base:18.0.2 (*) -+| \--- com.google.android.gms:play-services-measurement-impl:18.0.2 (*) ++| +--- com.google.android.gms:play-services-measurement-base:18.0.3 (*) ++| \--- com.google.android.gms:play-services-measurement-impl:18.0.3 (*) ++--- com.google.firebase:firebase-config-ktx:20.0.4 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| +--- com.google.firebase:firebase-abt:20.0.0 @@ -253,7 +253,7 @@ +| | +--- androidx.core:core:1.5.0-rc01 (*) +| | +--- androidx.cursoradapter:cursoradapter:1.0.0 +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha05 (*) ++| | +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha07 (*) +| | +--- androidx.fragment:fragment:1.3.2 (*) +| | +--- androidx.appcompat:appcompat-resources:1.3.0-rc01 +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) @@ -308,7 +308,7 @@ +| | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc01 (*) +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | | \--- androidx.legacy:legacy-support-core-utils:1.0.0 (*) -+| | +--- androidx.annotation:annotation-experimental:1.0.0 ++| | +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0 +| | +--- androidx.fragment:fragment:1.0.0 -> 1.3.2 (*) +| | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.1 (*) +| | +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 @@ -333,52 +333,54 @@ +| +--- 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.33-beta -+| +--- com.google.dagger:dagger:2.33 +++--- com.google.dagger:hilt-android:2.34.1-beta ++| +--- com.google.dagger:dagger:2.34.1 +| | \--- javax.inject:javax.inject:1 -+| +--- com.google.dagger:dagger-lint-aar:2.33 -+| +--- com.google.dagger:hilt-core:2.33-beta -+| | +--- com.google.dagger:dagger:2.33 (*) ++| +--- 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 (*) +| | \--- javax.inject:javax.inject:1 -+| +--- androidx.activity:activity:1.2.0 -> 1.3.0-alpha05 (*) ++| +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha07 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- androidx.fragment:fragment:1.3.0 -> 1.3.2 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 -> 2.3.1 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0 -> 2.3.1 (*) ++| +--- androidx.fragment:fragment:1.3.2 (*) ++| +--- androidx.lifecycle:lifecycle-common:2.3.1 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1 (*) +| +--- androidx.savedstate:savedstate:1.1.0 (*) +| \--- javax.inject:javax.inject:1 ++--- 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 (*) ++| | \--- com.google.dagger:hilt-core:2.33-beta -> 2.34.1-beta (*) +| +--- 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 (*) -+| | +--- androidx.room:room-runtime:2.2.5 -> 2.2.6 -+| | | +--- androidx.room:room-common:2.2.6 ++| | +--- androidx.room:room-runtime:2.2.5 -> 2.3.0 ++| | | +--- androidx.room:room-common:2.3.0 +| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.sqlite:sqlite-framework:2.0.1 -> 2.1.0 ++| | | +--- androidx.sqlite:sqlite-framework:2.1.0 +| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| | | | \--- androidx.sqlite:sqlite:2.1.0 +| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | +--- androidx.sqlite:sqlite:2.0.1 -> 2.1.0 (*) -+| | | \--- androidx.arch.core:core-runtime:2.0.1 -> 2.1.0 (*) ++| | | +--- androidx.sqlite:sqlite:2.1.0 (*) ++| | | +--- androidx.arch.core:core-runtime:2.0.1 -> 2.1.0 (*) ++| | | \--- androidx.annotation:annotation-experimental:1.1.0 +| | +--- androidx.sqlite:sqlite:2.1.0 (*) +| | +--- 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 (*) ++| \--- com.google.dagger:hilt-android:2.33-beta -> 2.34.1-beta (*) ++--- androidx.fragment:fragment-ktx:1.3.2 +| +--- androidx.fragment:fragment:1.3.2 (*) -+| +--- androidx.activity:activity-ktx:1.2.2 -> 1.3.0-alpha05 -+| | +--- androidx.activity:activity:1.3.0-alpha05 (*) ++| +--- androidx.activity:activity-ktx:1.2.2 -> 1.3.0-alpha07 ++| | +--- androidx.activity:activity:1.3.0-alpha07 (*) +| | +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) +| | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.3.1 (*) +| | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1 (*) +| | +--- androidx.savedstate:savedstate-ktx:1.1.0 +| | | +--- androidx.savedstate:savedstate:1.1.0 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) +| +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) +| +--- androidx.collection:collection-ktx:1.1.0 +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.4.32 (*) @@ -389,11 +391,11 @@ +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*) ++--- androidx.lifecycle:lifecycle-runtime-ktx:2.3.0 -> 2.3.1 (*) ++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0 -> 2.3.1 (*) -++--- androidx.room:room-ktx:2.2.6 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.41 -> 1.4.32 (*) -+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.3 (*) -+| +--- androidx.room:room-common:2.2.6 (*) -+| \--- androidx.room:room-runtime:2.2.6 (*) +++--- androidx.room:room-ktx:2.3.0 ++| +--- androidx.room:room-common:2.3.0 (*) ++| +--- androidx.room:room-runtime:2.3.0 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) ++| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*) ++--- androidx.appcompat:appcompat:1.3.0-rc01 (*) ++--- io.reactivex.rxjava2:rxandroid:2.1.1 +| \--- io.reactivex.rxjava2:rxjava:2.2.6 @@ -455,27 +457,27 @@ ++--- com.google.apis:google-api-services-tasks:v1-rev20210109-1.31.0 +| \--- com.google.api-client:google-api-client:1.31.1 +| +--- com.google.oauth-client:google-oauth-client:1.31.2 -+| | +--- com.google.http-client:google-http-client:1.38.0 -> 1.39.1 -+| | | +--- com.google.guava:guava:30.1-android ++| | +--- com.google.http-client:google-http-client:1.38.0 -> 1.39.2 ++| | | +--- com.google.guava:guava:30.1.1-android +| | | | +--- com.google.guava:failureaccess:1.0.1 +| | | | \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava +| | | +--- io.opencensus:opencensus-api:0.28.0 +| | | | \--- io.grpc:grpc-context:1.27.2 +| | | \--- io.opencensus:opencensus-contrib-http-util:0.28.0 +| | | +--- io.opencensus:opencensus-api:0.28.0 (*) -+| | | \--- com.google.guava:guava:29.0-android -> 30.1-android (*) -+| | \--- com.google.guava:guava:30.0-android -> 30.1-android (*) -+| \--- com.google.guava:guava:29.0-android -> 30.1-android (*) -++--- com.google.apis:google-api-services-drive:v3-rev20210228-1.31.0 ++| | | \--- 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.api-client:google-api-client:1.31.1 (*) -++--- com.google.auth:google-auth-library-oauth2-http:0.25.2 -+| +--- com.google.auto.value:auto-value-annotations:1.7.4 -+| +--- com.google.auth:google-auth-library-credentials:0.25.2 -+| +--- com.google.http-client:google-http-client:1.39.1 (*) -+| +--- com.google.http-client:google-http-client-gson:1.39.1 -+| | +--- com.google.http-client:google-http-client:1.39.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.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 (*) +| | \--- com.google.code.gson:gson:2.8.6 -+| \--- com.google.guava:guava:30.1-android (*) ++| \--- com.google.guava:guava:30.1.1-android (*) ++--- androidx.work:work-runtime:2.5.0 (*) ++--- androidx.work:work-runtime-ktx:2.5.0 +| +--- androidx.work:work-runtime:2.5.0 (*) @@ -509,56 +511,56 @@ +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava ++--- org.osmdroid:osmdroid-android:6.1.10 -++--- androidx.compose.ui:ui:1.0.0-beta04 -+| +--- androidx.compose.animation:animation-core:1.0.0-beta04 +++--- androidx.compose.ui:ui:1.0.0-beta05 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta05 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3 (*) -+| | +--- androidx.compose.runtime:runtime:1.0.0-beta04 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta05 +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3 (*) +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.3 -> 0.3.4 (*) ++| | | +--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.4 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| | +--- androidx.compose.ui:ui-unit:1.0.0-beta04 -+| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta04 ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta05 ++| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta05 +| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | | +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) -+| | | | +--- androidx.compose.ui:ui-util:1.0.0-beta04 ++| | | | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| | | | +--- androidx.compose.ui:ui-util:1.0.0-beta05 +| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) +| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| | | +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) -+| | | \--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| | | \--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta04 -+| | +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) ++| +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta05 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| +--- androidx.compose.ui:ui-geometry:1.0.0-beta04 (*) -+| +--- androidx.compose.ui:ui-graphics:1.0.0-beta04 ++| +--- androidx.compose.ui:ui-geometry:1.0.0-beta05 (*) ++| +--- androidx.compose.ui:ui-graphics:1.0.0-beta05 +| | +--- androidx.annotation:annotation:1.2.0-beta01 -> 1.2.0 -+| | +--- androidx.compose.ui:ui-unit:1.0.0-beta04 (*) -+| | +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta05 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- androidx.compose.ui:ui-text:1.0.0-beta04 -+| | +--- androidx.compose.ui:ui-graphics:1.0.0-beta04 (*) -+| | +--- androidx.compose.ui:ui-unit:1.0.0-beta04 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta05 ++| | +--- androidx.compose.ui:ui-graphics:1.0.0-beta05 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta05 (*) +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| | +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) -+| | +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta04 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| | +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta05 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) +| | +--- androidx.collection:collection:1.1.0 (*) +| | \--- androidx.core:core:1.5.0-beta01 -> 1.5.0-rc01 (*) -+| +--- androidx.compose.ui:ui-unit:1.0.0-beta04 (*) ++| +--- androidx.compose.ui:ui-unit:1.0.0-beta05 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3 (*) -+| +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) -+| +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| +--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) +| +--- androidx.autofill:autofill:1.0.0 +| | \--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) @@ -566,62 +568,62 @@ +| +--- androidx.savedstate:savedstate:1.1.0 (*) +| +--- androidx.lifecycle:lifecycle-runtime:2.3.0 -> 2.3.1 (*) +| \--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 -> 2.3.1 (*) -++--- androidx.compose.foundation:foundation:1.0.0-beta04 +++--- androidx.compose.foundation:foundation:1.0.0-beta05 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- androidx.compose.animation:animation:1.0.0-beta04 ++| +--- androidx.compose.animation:animation:1.0.0-beta05 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | +--- androidx.compose.animation:animation-core:1.0.0-beta04 (*) -+| | +--- androidx.compose.foundation:foundation-layout:1.0.0-beta04 ++| | +--- androidx.compose.animation:animation-core:1.0.0-beta05 (*) ++| | +--- androidx.compose.foundation:foundation-layout:1.0.0-beta05 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.compose.ui:ui:1.0.0-beta04 (*) -+| | | +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) -+| | | +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) ++| | | +--- androidx.compose.ui:ui:1.0.0-beta05 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| | | +--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| | +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) -+| | +--- androidx.compose.ui:ui:1.0.0-beta04 (*) -+| | +--- androidx.compose.ui:ui-geometry:1.0.0-beta04 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| | +--- androidx.compose.ui:ui:1.0.0-beta05 (*) ++| | +--- androidx.compose.ui:ui-geometry:1.0.0-beta05 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) -+| +--- androidx.compose.ui:ui:1.0.0-beta04 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| +--- androidx.compose.ui:ui:1.0.0-beta05 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta04 (*) -+| +--- androidx.compose.ui:ui-text:1.0.0-beta04 (*) -+| \--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) -++--- androidx.compose.material:material:1.0.0-beta04 -+| +--- androidx.compose.animation:animation-core:1.0.0-beta04 (*) -+| +--- androidx.compose.foundation:foundation:1.0.0-beta04 (*) -+| +--- androidx.compose.material:material-icons-core:1.0.0-beta04 -+| | +--- androidx.compose.ui:ui:1.0.0-beta04 (*) ++| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta05 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta05 (*) ++| \--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) +++--- androidx.compose.material:material:1.0.0-beta05 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta05 (*) ++| +--- androidx.compose.foundation:foundation:1.0.0-beta05 (*) ++| +--- androidx.compose.material:material-icons-core:1.0.0-beta05 ++| | +--- androidx.compose.ui:ui:1.0.0-beta05 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| +--- androidx.compose.material:material-ripple:1.0.0-beta04 -+| | +--- androidx.compose.foundation:foundation:1.0.0-beta04 (*) -+| | +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) ++| +--- androidx.compose.material:material-ripple:1.0.0-beta05 ++| | +--- androidx.compose.foundation:foundation:1.0.0-beta05 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| | +--- androidx.compose.animation:animation:1.0.0-beta04 (*) -+| | \--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) -+| +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) -+| +--- androidx.compose.ui:ui:1.0.0-beta04 (*) -+| +--- androidx.compose.ui:ui-text:1.0.0-beta04 (*) ++| | +--- androidx.compose.animation:animation:1.0.0-beta05 (*) ++| | \--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| +--- androidx.compose.ui:ui:1.0.0-beta05 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta05 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- androidx.compose.animation:animation:1.0.0-beta04 (*) -+| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta04 (*) -+| \--- androidx.compose.ui:ui-util:1.0.0-beta04 (*) -++--- androidx.compose.runtime:runtime-livedata:1.0.0-beta04 -+| +--- androidx.compose.runtime:runtime:1.0.0-beta04 (*) ++| +--- androidx.compose.animation:animation:1.0.0-beta05 (*) ++| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta05 (*) ++| \--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) +++--- androidx.compose.runtime:runtime-livedata:1.0.0-beta05 ++| +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| \--- androidx.compose.ui:ui:1.0.0-beta04 (*) ++| \--- androidx.compose.ui:ui:1.0.0-beta05 (*) ++--- com.google.android.material:compose-theme-adapter:1.0.0-beta04 +| +--- 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 (*) -+| +--- androidx.compose.material:material:1.0.0-beta04 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta04 -> 1.0.0-beta05 (*) ++| +--- androidx.compose.material:material:1.0.0-beta04 -> 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 (*) -+\--- androidx.activity:activity-compose:1.3.0-alpha05 -+ +--- androidx.compose.runtime:runtime:1.0.0-beta03 -> 1.0.0-beta04 (*) -+ +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta03 -> 1.0.0-beta04 (*) -+ +--- androidx.activity:activity-ktx:1.3.0-alpha05 (*) -+ +--- androidx.compose.ui:ui:1.0.0-beta03 -> 1.0.0-beta04 (*) -+ \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 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 (*) ++ +--- androidx.activity:activity-ktx:1.3.0-alpha07 (*) ++ +--- androidx.compose.ui:ui:1.0.0-beta05 (*) ++ \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)