diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7aabd9d1f..aa2263da0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -229,8 +229,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:1.0.0-beta05") - implementation("androidx.activity:activity-compose:1.3.0-alpha07") + implementation("com.google.android.material:compose-theme-adapter:${Versions.compose}") + implementation("androidx.activity:activity-compose:1.3.0-alpha08") 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 c4153bdd6..6867da985 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -17,5 +17,5 @@ object Versions { 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-beta06" + const val compose = "1.0.0-beta07" } \ No newline at end of file diff --git a/deps_fdroid.txt b/deps_fdroid.txt index eb54e89d7..67e28996c 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-alpha07 ++| | | +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha08 +| | | | +--- 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 (*) @@ -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-alpha07 (*) ++| | +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha08 (*) +| | +--- androidx.fragment:fragment:1.3.2 (*) +| | +--- androidx.appcompat:appcompat-resources:1.3.0-rc01 +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) @@ -223,7 +223,7 @@ +| +--- 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.activity:activity:1.2.2 -> 1.3.0-alpha08 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| +--- androidx.fragment:fragment:1.3.2 (*) +| +--- androidx.lifecycle:lifecycle-common:2.3.1 (*) @@ -255,8 +255,8 @@ +| \--- 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 -+| | +--- androidx.activity:activity:1.3.0-alpha07 (*) ++| +--- androidx.activity:activity-ktx:1.2.2 -> 1.3.0-alpha08 ++| | +--- androidx.activity:activity:1.3.0-alpha08 (*) +| | +--- 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 (*) @@ -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-beta06 -+| +--- androidx.compose.animation:animation-core:1.0.0-beta06 +++--- androidx.compose.ui:ui:1.0.0-beta07 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta07 +| | +--- 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-beta06 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta07 +| | | +--- 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-beta06 -+| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta06 ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta07 ++| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta07 +| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) -+| | | | +--- androidx.compose.ui:ui-util:1.0.0-beta06 ++| | | | +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| | | | +--- androidx.compose.ui:ui-util:1.0.0-beta07 +| | | | | \--- 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-beta06 (*) -+| | | \--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| | | \--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta06 -+| | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta07 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) +| | +--- 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-beta06 (*) -+| +--- androidx.compose.ui:ui-graphics:1.0.0-beta06 ++| +--- androidx.compose.ui:ui-geometry:1.0.0-beta07 (*) ++| +--- androidx.compose.ui:ui-graphics:1.0.0-beta07 +| | +--- androidx.annotation:annotation:1.2.0-beta01 -> 1.2.0 -+| | +--- 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 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta07 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- 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.compose.ui:ui-text:1.0.0-beta07 ++| | +--- androidx.compose.ui:ui-graphics:1.0.0-beta07 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta07 (*) +| | +--- 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-beta06 (*) -+| | +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta06 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| | +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta07 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) +| | +--- 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-beta06 (*) ++| +--- androidx.compose.ui:ui-unit:1.0.0-beta07 (*) +| +--- 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-beta06 (*) -+| +--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| +--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) +| +--- 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-beta06 +++--- androidx.compose.foundation:foundation:1.0.0-beta07 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- androidx.compose.animation:animation:1.0.0-beta06 ++| +--- androidx.compose.animation:animation:1.0.0-beta07 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | +--- androidx.compose.animation:animation-core:1.0.0-beta06 (*) -+| | +--- androidx.compose.foundation:foundation-layout:1.0.0-beta06 ++| | +--- androidx.compose.animation:animation-core:1.0.0-beta07 (*) ++| | +--- androidx.compose.foundation:foundation-layout:1.0.0-beta07 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- 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 (*) ++| | | +--- androidx.compose.ui:ui:1.0.0-beta07 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| | | +--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| | +--- 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 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| | +--- androidx.compose.ui:ui:1.0.0-beta07 (*) ++| | +--- androidx.compose.ui:ui-geometry:1.0.0-beta07 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) -+| +--- androidx.compose.ui:ui:1.0.0-beta06 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| +--- androidx.compose.ui:ui:1.0.0-beta07 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- 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 (*) ++| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta07 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta07 (*) ++| \--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) +++--- androidx.compose.material:material:1.0.0-beta07 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta07 (*) ++| +--- androidx.compose.foundation:foundation:1.0.0-beta07 (*) ++| +--- androidx.compose.material:material-icons-core:1.0.0-beta07 ++| | +--- androidx.compose.ui:ui:1.0.0-beta07 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| +--- 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 (*) ++| +--- androidx.compose.material:material-ripple:1.0.0-beta07 ++| | +--- androidx.compose.foundation:foundation:1.0.0-beta07 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| | +--- 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 (*) ++| | +--- androidx.compose.animation:animation:1.0.0-beta07 (*) ++| | \--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| +--- androidx.compose.ui:ui:1.0.0-beta07 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta07 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- 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.compose.animation:animation:1.0.0-beta07 (*) ++| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta07 (*) ++| \--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) +++--- androidx.compose.runtime:runtime-livedata:1.0.0-beta07 ++| +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| \--- androidx.compose.ui:ui:1.0.0-beta06 (*) -++--- com.google.android.material:compose-theme-adapter:1.0.0-beta05 ++| \--- androidx.compose.ui:ui:1.0.0-beta07 (*) +++--- com.google.android.material:compose-theme-adapter:1.0.0-beta07 +| +--- 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 -> 1.0.0-beta06 (*) -+| +--- androidx.compose.material:material:1.0.0-beta05 -> 1.0.0-beta06 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| +--- androidx.compose.material:material:1.0.0-beta07 (*) +| +--- 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 -> 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 -> 1.0.0-beta06 (*) ++\--- androidx.activity:activity-compose:1.3.0-alpha08 ++ +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++ +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta07 (*) ++ +--- androidx.activity:activity-ktx:1.3.0-alpha08 (*) ++ +--- androidx.compose.ui:ui:1.0.0-beta07 (*) + \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 66d64caef..9a3fec073 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-alpha07 ++| | | +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha08 +| | | | +--- 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 (*) @@ -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-alpha07 (*) ++| | +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha08 (*) +| | +--- androidx.fragment:fragment:1.3.2 (*) +| | +--- androidx.appcompat:appcompat-resources:1.3.0-rc01 +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) @@ -340,7 +340,7 @@ +| +--- 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.activity:activity:1.2.2 -> 1.3.0-alpha08 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| +--- androidx.fragment:fragment:1.3.2 (*) +| +--- androidx.lifecycle:lifecycle-common:2.3.1 (*) @@ -372,8 +372,8 @@ +| \--- 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 -+| | +--- androidx.activity:activity:1.3.0-alpha07 (*) ++| +--- androidx.activity:activity-ktx:1.2.2 -> 1.3.0-alpha08 ++| | +--- androidx.activity:activity:1.3.0-alpha08 (*) +| | +--- 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 (*) @@ -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-beta06 -+| +--- androidx.compose.animation:animation-core:1.0.0-beta06 +++--- androidx.compose.ui:ui:1.0.0-beta07 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta07 +| | +--- 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-beta06 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta07 +| | | +--- 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-beta06 -+| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta06 ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta07 ++| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta07 +| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) -+| | | | +--- androidx.compose.ui:ui-util:1.0.0-beta06 ++| | | | +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| | | | +--- androidx.compose.ui:ui-util:1.0.0-beta07 +| | | | | \--- 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-beta06 (*) -+| | | \--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| | | \--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta06 -+| | +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) ++| +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta07 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) +| | +--- 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-beta06 (*) -+| +--- androidx.compose.ui:ui-graphics:1.0.0-beta06 ++| +--- androidx.compose.ui:ui-geometry:1.0.0-beta07 (*) ++| +--- androidx.compose.ui:ui-graphics:1.0.0-beta07 +| | +--- androidx.annotation:annotation:1.2.0-beta01 -> 1.2.0 -+| | +--- 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 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta07 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- 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.compose.ui:ui-text:1.0.0-beta07 ++| | +--- androidx.compose.ui:ui-graphics:1.0.0-beta07 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta07 (*) +| | +--- 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-beta06 (*) -+| | +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta06 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| | +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta07 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) +| | +--- 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-beta06 (*) ++| +--- androidx.compose.ui:ui-unit:1.0.0-beta07 (*) +| +--- 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-beta06 (*) -+| +--- androidx.compose.ui:ui-util:1.0.0-beta06 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| +--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) +| +--- 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-beta06 +++--- androidx.compose.foundation:foundation:1.0.0-beta07 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- androidx.compose.animation:animation:1.0.0-beta06 ++| +--- androidx.compose.animation:animation:1.0.0-beta07 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | +--- androidx.compose.animation:animation-core:1.0.0-beta06 (*) -+| | +--- androidx.compose.foundation:foundation-layout:1.0.0-beta06 ++| | +--- androidx.compose.animation:animation-core:1.0.0-beta07 (*) ++| | +--- androidx.compose.foundation:foundation-layout:1.0.0-beta07 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- 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 (*) ++| | | +--- androidx.compose.ui:ui:1.0.0-beta07 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| | | +--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| | +--- 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 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| | +--- androidx.compose.ui:ui:1.0.0-beta07 (*) ++| | +--- androidx.compose.ui:ui-geometry:1.0.0-beta07 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- androidx.compose.runtime:runtime:1.0.0-beta06 (*) -+| +--- androidx.compose.ui:ui:1.0.0-beta06 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| +--- androidx.compose.ui:ui:1.0.0-beta07 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- 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 (*) ++| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta07 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta07 (*) ++| \--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) +++--- androidx.compose.material:material:1.0.0-beta07 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta07 (*) ++| +--- androidx.compose.foundation:foundation:1.0.0-beta07 (*) ++| +--- androidx.compose.material:material-icons-core:1.0.0-beta07 ++| | +--- androidx.compose.ui:ui:1.0.0-beta07 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| +--- 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 (*) ++| +--- androidx.compose.material:material-ripple:1.0.0-beta07 ++| | +--- androidx.compose.foundation:foundation:1.0.0-beta07 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| | +--- 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 (*) ++| | +--- androidx.compose.animation:animation:1.0.0-beta07 (*) ++| | \--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| +--- androidx.compose.ui:ui:1.0.0-beta07 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta07 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| +--- 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.compose.animation:animation:1.0.0-beta07 (*) ++| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta07 (*) ++| \--- androidx.compose.ui:ui-util:1.0.0-beta07 (*) +++--- androidx.compose.runtime:runtime-livedata:1.0.0-beta07 ++| +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| \--- androidx.compose.ui:ui:1.0.0-beta06 (*) -++--- com.google.android.material:compose-theme-adapter:1.0.0-beta05 ++| \--- androidx.compose.ui:ui:1.0.0-beta07 (*) +++--- com.google.android.material:compose-theme-adapter:1.0.0-beta07 +| +--- 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 -> 1.0.0-beta06 (*) -+| +--- androidx.compose.material:material:1.0.0-beta05 -> 1.0.0-beta06 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| +--- androidx.compose.material:material:1.0.0-beta07 (*) +| +--- 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 -> 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 -> 1.0.0-beta06 (*) ++\--- androidx.activity:activity-compose:1.3.0-alpha08 ++ +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++ +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta07 (*) ++ +--- androidx.activity:activity-ktx:1.3.0-alpha08 (*) ++ +--- androidx.compose.ui:ui:1.0.0-beta07 (*) + \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)