From 3363afe46079db183833bf6ef772ccadcba1852b Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 5 May 2021 13:32:15 -0500 Subject: [PATCH] Update compose, hilt --- app/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/Versions.kt | 6 +- deps_fdroid.txt | 140 +++++++++++++-------------- deps_googleplay.txt | 140 +++++++++++++-------------- 4 files changed, 144 insertions(+), 144 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 14ef76d80..7aabd9d1f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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:${Versions.compose}") + implementation("com.google.android.material:compose-theme-adapter:1.0.0-beta05") implementation("androidx.activity:activity-compose:1.3.0-alpha07") releaseCompileOnly("androidx.compose.ui:ui-tooling:${Versions.compose}") diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 8cd7a7115..c4153bdd6 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -9,13 +9,13 @@ object Versions { const val analytics = "18.0.3" const val remote_config = "20.0.4" const val okhttp = "4.8.1" - const val flipper = "0.85.0" + const val flipper = "0.87.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.35.1" - const val hilt_androidx = "1.0.0-beta01" + const val hilt_androidx = "1.0.0" const val lifecycle = "2.3.0" const val markwon = "4.6.2" - const val compose = "1.0.0-beta05" + const val compose = "1.0.0-beta06" } \ No newline at end of file diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 6fa5b0f4b..c0f6835b1 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -231,10 +231,10 @@ +| +--- 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.hilt:hilt-work:1.0.0 +| +--- 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.35.1 (*) ++| +--- androidx.hilt:hilt-common:1.0.0 ++| | \--- com.google.dagger:hilt-core:2.35 -> 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.35.1 (*) ++| \--- com.google.dagger:hilt-android:2.35 -> 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 @@ -394,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-beta05 -+| +--- androidx.compose.animation:animation-core:1.0.0-beta05 +++--- androidx.compose.ui:ui:1.0.0-beta06 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta06 +| | +--- 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-beta05 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta06 +| | | +--- 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.4 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| | +--- androidx.compose.ui:ui-unit:1.0.0-beta05 -+| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta05 ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta06 ++| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta06 +| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) -+| | | | +--- androidx.compose.ui:ui-util:1.0.0-beta05 ++| | | | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| | | | +--- androidx.compose.ui:ui-util:1.0.0-beta06 +| | | | | \--- 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-beta05 (*) -+| | | \--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| | | \--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta05 -+| | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta06 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) +| | +--- 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-beta05 (*) -+| +--- androidx.compose.ui:ui-graphics:1.0.0-beta05 ++| +--- androidx.compose.ui:ui-geometry:1.0.0-beta06 (*) ++| +--- androidx.compose.ui:ui-graphics:1.0.0-beta06 +| | +--- androidx.annotation:annotation:1.2.0-beta01 -> 1.2.0 -+| | +--- 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 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta06 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- 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.compose.ui:ui-text:1.0.0-beta06 ++| | +--- androidx.compose.ui:ui-graphics:1.0.0-beta06 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta06 (*) +| | +--- 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-beta05 (*) -+| | +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta05 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| | +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta06 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) +| | +--- 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-beta05 (*) ++| +--- androidx.compose.ui:ui-unit:1.0.0-beta06 (*) +| +--- 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-beta05 (*) -+| +--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| +--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) +| +--- androidx.autofill:autofill:1.0.0 +| | \--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) @@ -451,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-beta05 +++--- androidx.compose.foundation:foundation:1.0.0-beta06 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- androidx.compose.animation:animation:1.0.0-beta05 ++| +--- androidx.compose.animation:animation:1.0.0-beta06 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | +--- androidx.compose.animation:animation-core:1.0.0-beta05 (*) -+| | +--- androidx.compose.foundation:foundation-layout:1.0.0-beta05 ++| | +--- androidx.compose.animation:animation-core:1.0.0-beta06 (*) ++| | +--- androidx.compose.foundation:foundation-layout:1.0.0-beta06 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- 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 (*) ++| | | +--- androidx.compose.ui:ui:1.0.0-beta06 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| | | +--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| | +--- 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 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| | +--- androidx.compose.ui:ui:1.0.0-beta06 (*) ++| | +--- androidx.compose.ui:ui-geometry:1.0.0-beta06 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) -+| +--- androidx.compose.ui:ui:1.0.0-beta05 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| +--- androidx.compose.ui:ui:1.0.0-beta06 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- 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 (*) ++| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta06 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta06 (*) ++| \--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) +++--- androidx.compose.material:material:1.0.0-beta06 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta06 (*) ++| +--- androidx.compose.foundation:foundation:1.0.0-beta06 (*) ++| +--- androidx.compose.material:material-icons-core:1.0.0-beta06 ++| | +--- androidx.compose.ui:ui:1.0.0-beta06 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| +--- 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 (*) ++| +--- androidx.compose.material:material-ripple:1.0.0-beta06 ++| | +--- androidx.compose.foundation:foundation:1.0.0-beta06 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| | +--- 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 (*) ++| | +--- androidx.compose.animation:animation:1.0.0-beta06 (*) ++| | \--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| +--- androidx.compose.ui:ui:1.0.0-beta06 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta06 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- 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.compose.animation:animation:1.0.0-beta06 (*) ++| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta06 (*) ++| \--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) +++--- androidx.compose.runtime:runtime-livedata:1.0.0-beta06 ++| +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| \--- androidx.compose.ui:ui:1.0.0-beta05 (*) ++| \--- androidx.compose.ui:ui:1.0.0-beta06 (*) ++--- 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-beta05 (*) -+| +--- androidx.compose.material:material:1.0.0-beta05 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta05 -> 1.0.0-beta06 (*) ++| +--- androidx.compose.material:material:1.0.0-beta05 -> 1.0.0-beta06 (*) +| +--- com.google.android.material:material:1.1.0 -> 1.3.0 (*) +| \--- 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 (*) ++ +--- androidx.compose.runtime:runtime:1.0.0-beta05 -> 1.0.0-beta06 (*) ++ +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta05 -> 1.0.0-beta06 (*) + +--- androidx.activity:activity-ktx:1.3.0-alpha07 (*) -+ +--- androidx.compose.ui:ui:1.0.0-beta05 (*) ++ +--- androidx.compose.ui:ui:1.0.0-beta05 -> 1.0.0-beta06 (*) + \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 3e1d3b1c5..554cbc63a 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -348,10 +348,10 @@ +| +--- 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.hilt:hilt-work:1.0.0 +| +--- 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.35.1 (*) ++| +--- androidx.hilt:hilt-common:1.0.0 ++| | \--- com.google.dagger:hilt-core:2.35 -> 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.35.1 (*) ++| \--- com.google.dagger:hilt-android:2.35 -> 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 @@ -511,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-beta05 -+| +--- androidx.compose.animation:animation-core:1.0.0-beta05 +++--- androidx.compose.ui:ui:1.0.0-beta06 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta06 +| | +--- 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-beta05 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta06 +| | | +--- 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.4 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| | +--- androidx.compose.ui:ui-unit:1.0.0-beta05 -+| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta05 ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta06 ++| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta06 +| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) -+| | | | +--- androidx.compose.ui:ui-util:1.0.0-beta05 ++| | | | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| | | | +--- androidx.compose.ui:ui-util:1.0.0-beta06 +| | | | | \--- 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-beta05 (*) -+| | | \--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| | | \--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta05 -+| | +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) ++| +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta06 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) +| | +--- 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-beta05 (*) -+| +--- androidx.compose.ui:ui-graphics:1.0.0-beta05 ++| +--- androidx.compose.ui:ui-geometry:1.0.0-beta06 (*) ++| +--- androidx.compose.ui:ui-graphics:1.0.0-beta06 +| | +--- androidx.annotation:annotation:1.2.0-beta01 -> 1.2.0 -+| | +--- 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 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta06 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- 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.compose.ui:ui-text:1.0.0-beta06 ++| | +--- androidx.compose.ui:ui-graphics:1.0.0-beta06 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta06 (*) +| | +--- 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-beta05 (*) -+| | +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta05 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| | +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta06 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) +| | +--- 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-beta05 (*) ++| +--- androidx.compose.ui:ui-unit:1.0.0-beta06 (*) +| +--- 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-beta05 (*) -+| +--- androidx.compose.ui:ui-util:1.0.0-beta05 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| +--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) +| +--- androidx.autofill:autofill:1.0.0 +| | \--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) @@ -568,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-beta05 +++--- androidx.compose.foundation:foundation:1.0.0-beta06 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- androidx.compose.animation:animation:1.0.0-beta05 ++| +--- androidx.compose.animation:animation:1.0.0-beta06 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | +--- androidx.compose.animation:animation-core:1.0.0-beta05 (*) -+| | +--- androidx.compose.foundation:foundation-layout:1.0.0-beta05 ++| | +--- androidx.compose.animation:animation-core:1.0.0-beta06 (*) ++| | +--- androidx.compose.foundation:foundation-layout:1.0.0-beta06 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- 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 (*) ++| | | +--- androidx.compose.ui:ui:1.0.0-beta06 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| | | +--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| | +--- 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 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| | +--- androidx.compose.ui:ui:1.0.0-beta06 (*) ++| | +--- androidx.compose.ui:ui-geometry:1.0.0-beta06 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- androidx.compose.runtime:runtime:1.0.0-beta05 (*) -+| +--- androidx.compose.ui:ui:1.0.0-beta05 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| +--- androidx.compose.ui:ui:1.0.0-beta06 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- 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 (*) ++| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta06 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta06 (*) ++| \--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) +++--- androidx.compose.material:material:1.0.0-beta06 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta06 (*) ++| +--- androidx.compose.foundation:foundation:1.0.0-beta06 (*) ++| +--- androidx.compose.material:material-icons-core:1.0.0-beta06 ++| | +--- androidx.compose.ui:ui:1.0.0-beta06 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| +--- 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 (*) ++| +--- androidx.compose.material:material-ripple:1.0.0-beta06 ++| | +--- androidx.compose.foundation:foundation:1.0.0-beta06 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| | +--- 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 (*) ++| | +--- androidx.compose.animation:animation:1.0.0-beta06 (*) ++| | \--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| +--- androidx.compose.ui:ui:1.0.0-beta06 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta06 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- 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.compose.animation:animation:1.0.0-beta06 (*) ++| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta06 (*) ++| \--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) +++--- androidx.compose.runtime:runtime-livedata:1.0.0-beta06 ++| +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| \--- androidx.compose.ui:ui:1.0.0-beta05 (*) ++| \--- androidx.compose.ui:ui:1.0.0-beta06 (*) ++--- 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-beta05 (*) -+| +--- androidx.compose.material:material:1.0.0-beta05 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta05 -> 1.0.0-beta06 (*) ++| +--- androidx.compose.material:material:1.0.0-beta05 -> 1.0.0-beta06 (*) +| +--- com.google.android.material:material:1.1.0 -> 1.3.0 (*) +| \--- 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 (*) ++ +--- androidx.compose.runtime:runtime:1.0.0-beta05 -> 1.0.0-beta06 (*) ++ +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta05 -> 1.0.0-beta06 (*) + +--- androidx.activity:activity-ktx:1.3.0-alpha07 (*) -+ +--- androidx.compose.ui:ui:1.0.0-beta05 (*) ++ +--- androidx.compose.ui:ui:1.0.0-beta05 -> 1.0.0-beta06 (*) + \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)