From 0aa09d834d0f6412c2bdc95d7604f7fcfc79ab81 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 13 Oct 2021 13:13:20 -0500 Subject: [PATCH] Jetpack Compose 1.0.4 --- buildSrc/src/main/kotlin/Versions.kt | 6 +- deps_fdroid.txt | 236 +++++++++++++------------- deps_googleplay.txt | 242 +++++++++++++-------------- 3 files changed, 242 insertions(+), 242 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 323b3d950..0882ab643 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,5 +1,5 @@ object Versions { - const val kotlin = "1.5.30" + const val kotlin = "1.5.31" const val compileSdk = 31 const val targetSdk = 31 const val minSdk = 24 @@ -18,6 +18,6 @@ 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.3" - const val compose_theme_adapter = "1.0.2" + const val compose = "1.0.4" + const val compose_theme_adapter = "1.0.3" } diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 6607e8519..d7858fbd1 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -22,14 +22,14 @@ +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.0 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0 +| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.0 -> 1.5.30 -+| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.0 -> 1.5.31 ++| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 +| | | | | +--- org.jetbrains:annotations:13.0 -> 20.1.0 -+| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 -+| | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30 -+| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.0 -> 1.5.30 -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.0 -> 1.5.30 (*) ++| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 ++| | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31 ++| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.0 -> 1.5.31 ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.0 -> 1.5.31 (*) +| +--- androidx.lifecycle:lifecycle-extensions:2.2.0 +| | +--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.1 (*) +| | +--- androidx.arch.core:core-common:2.1.0 (*) @@ -93,13 +93,13 @@ +| | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 -> 2.3.1 (*) +| +--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 -> 2.3.1 +| | +--- androidx.lifecycle:lifecycle-runtime:2.3.1 (*) -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.30 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.31 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.0 (*) +| | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| +--- androidx.databinding:databinding-runtime:7.0.3 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32 -> 1.5.30 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32 -> 1.5.31 (*) ++--- com.gitlab.abaker:dav4jvm:deb2c9aef8 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.5.30 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.5.31 (*) +| \--- org.apache.commons:commons-lang3:3.8.1 ++--- com.gitlab.abaker:ical4android:0e928b567c +| +--- org.mnode.ical4j:ical4j:3.0.21 @@ -107,21 +107,21 @@ +| | +--- commons-codec:commons-codec:1.11 +| | +--- org.apache.commons:commons-lang3:3.8.1 +| | \--- org.apache.commons:commons-collections4:4.1 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.5.30 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.5.31 (*) +| +--- com.sun.mail:android-mail:1.6.5 +| | \--- com.sun.mail:android-activation:1.6.5 +| +--- commons-io:commons-io:2.6 +| +--- org.slf4j:slf4j-jdk14:1.7.30 +| | \--- org.slf4j:slf4j-api:1.7.30 +| \--- androidx.core:core-ktx:1.3.2 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.5.30 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.5.31 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| \--- androidx.core:core:1.3.2 -> 1.5.0 (*) ++--- com.gitlab.bitfireAT:cert4android:26a91a729f +| +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.3 +| +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.3 (*) +| +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.3 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.5.30 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.5.31 (*) +| +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.1 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | +--- androidx.core:core:1.5.0 (*) @@ -154,15 +154,15 @@ +| | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| +--- androidx.lifecycle:lifecycle-extensions:2.2.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata-ktx:2.2.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.5.30 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.5.31 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.5.0 (*) +| | +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| | \--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0 -> 2.3.1 +| | +--- androidx.lifecycle:lifecycle-livedata-core:2.3.1 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.30 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.31 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 -> 2.3.1 +| | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 (*) -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.30 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.31 (*) +| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.0 (*) +| +--- com.google.android.material:material:1.2.1 -> 1.4.0 +| | +--- androidx.annotation:annotation:1.0.1 -> 1.2.0 @@ -267,22 +267,22 @@ +| | +--- 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.5.30 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.5.30 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.31 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.5.31 (*) +| +--- 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.5.30 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.5.31 (*) +| | \--- androidx.collection:collection:1.1.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.3.1 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1 (*) +| +--- androidx.savedstate:savedstate-ktx:1.1.0 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.30 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.31 (*) ++--- 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.4.0-alpha05 +| +--- androidx.room:room-common:2.4.0-alpha05 (*) +| +--- androidx.room:room-runtime:2.4.0-alpha05 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.5.31 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0 (*) ++--- androidx.appcompat:appcompat:1.3.1 (*) ++--- io.reactivex.rxjava2:rxandroid:2.1.1 @@ -313,15 +313,15 @@ +| \--- com.atlassian.commonmark:commonmark:0.13.0 ++--- io.noties.markwon:linkify:4.6.2 +| \--- io.noties.markwon:core:4.6.2 (*) -++--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30 (*) +++--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31 (*) ++--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.4 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.5.30 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.5.30 ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.5.31 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.5.31 ++--- com.squareup.okhttp3:okhttp:4.8.1 +| +--- com.squareup.okio:okio:2.7.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.5.30 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.5.30 -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.5.30 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.5.31 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.5.31 ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.5.31 (*) ++--- com.google.code.gson:gson:2.8.8 ++--- com.google.android.material:material:1.4.0 (*) ++--- androidx.constraintlayout:constraintlayout:2.1.0 (*) @@ -337,7 +337,7 @@ +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) ++--- com.jakewharton.timber:timber:5.0.1 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.5.30 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.5.31 (*) +| \--- org.jetbrains:annotations:20.1.0 ++--- com.google.android.apps.dashclock:dashclock-api:2.0.0 ++--- com.twofortyfouram:android-plugin-api-for-locale:1.0.2 @@ -372,10 +372,10 @@ ++--- androidx.work:work-runtime:2.7.0-beta01 (*) ++--- androidx.work:work-runtime-ktx:2.7.0-beta01 +| +--- androidx.work:work-runtime:2.7.0-beta01 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.5.30 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.5.31 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0 (*) ++--- com.etesync:journalmanager:1.1.1 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.5.30 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.5.31 (*) +| +--- com.madgag.spongycastle:core:1.54.0.0 +| +--- com.madgag.spongycastle:prov:1.54.0.0 +| | \--- com.madgag.spongycastle:core:1.54.0.0 @@ -402,49 +402,49 @@ +| +--- 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.11 -++--- androidx.compose.ui:ui:1.0.3 -+| +--- androidx.compose.runtime:runtime-saveable:1.0.3 -+| | +--- androidx.compose.runtime:runtime:1.0.3 +++--- androidx.compose.ui:ui:1.0.4 ++| +--- androidx.compose.runtime:runtime-saveable:1.0.4 ++| | +--- androidx.compose.runtime:runtime:1.0.4 +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0 (*) +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) -+| +--- androidx.compose.ui:ui-geometry:1.0.3 ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) ++| +--- androidx.compose.ui:ui-geometry:1.0.4 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.3 -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) -+| +--- androidx.compose.ui:ui-graphics:1.0.3 ++| | +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.4 ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) ++| +--- androidx.compose.ui:ui-graphics:1.0.4 +| | +--- androidx.annotation:annotation:1.2.0 -+| | +--- androidx.compose.ui:ui-unit:1.0.3 -+| | | +--- androidx.compose.ui:ui-geometry:1.0.3 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.4 ++| | | +--- androidx.compose.ui:ui-geometry:1.0.4 (*) +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) -+| | | +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| | | \--- androidx.compose.ui:ui-util:1.0.3 (*) -+| | +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.3 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 -+| +--- androidx.compose.ui:ui-text:1.0.3 -+| | +--- androidx.compose.ui:ui-graphics:1.0.3 (*) -+| | +--- androidx.compose.ui:ui-unit:1.0.3 (*) ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| | | \--- androidx.compose.ui:ui-util:1.0.4 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.4 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 ++| +--- androidx.compose.ui:ui-text:1.0.4 ++| | +--- androidx.compose.ui:ui-graphics:1.0.4 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.4 (*) +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 -+| | +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| | +--- androidx.compose.runtime:runtime-saveable:1.0.3 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.3 (*) -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 ++| | +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| | +--- androidx.compose.runtime:runtime-saveable:1.0.4 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.4 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) +| | +--- androidx.collection:collection:1.1.0 (*) +| | \--- androidx.core:core:1.5.0 (*) -+| +--- androidx.compose.ui:ui-unit:1.0.3 (*) ++| +--- androidx.compose.ui:ui-unit:1.0.4 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0 (*) -+| +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| +--- androidx.compose.ui:ui-util:1.0.3 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) ++| +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| +--- androidx.compose.ui:ui-util:1.0.4 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) +| +--- androidx.autofill:autofill:1.0.0 +| | \--- androidx.core:core:1.1.0 -> 1.5.0 (*) +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0 (*) @@ -454,72 +454,72 @@ +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| +--- androidx.lifecycle:lifecycle-runtime:2.3.0 -> 2.3.1 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 -> 2.3.1 (*) -+| \--- androidx.profileinstaller:profileinstaller:1.0.3 ++| \--- androidx.profileinstaller:profileinstaller:1.0.4 +| +--- androidx.annotation:annotation:1.2.0 +| \--- androidx.startup:startup-runtime:1.0.0 (*) -++--- androidx.compose.foundation:foundation:1.0.3 +++--- androidx.compose.foundation:foundation:1.0.4 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- androidx.compose.animation:animation:1.0.3 ++| +--- androidx.compose.animation:animation:1.0.4 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | +--- androidx.compose.animation:animation-core:1.0.3 ++| | +--- androidx.compose.animation:animation-core:1.0.4 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0 (*) -+| | | +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| | | +--- androidx.compose.ui:ui:1.0.3 (*) -+| | | +--- androidx.compose.ui:ui-unit:1.0.3 (*) -+| | | +--- androidx.compose.ui:ui-util:1.0.3 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) -+| | +--- androidx.compose.foundation:foundation-layout:1.0.3 ++| | | +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| | | +--- androidx.compose.ui:ui:1.0.4 (*) ++| | | +--- androidx.compose.ui:ui-unit:1.0.4 (*) ++| | | +--- androidx.compose.ui:ui-util:1.0.4 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) ++| | +--- androidx.compose.foundation:foundation-layout:1.0.4 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.compose.ui:ui:1.0.3 (*) -+| | | +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| | | +--- androidx.compose.ui:ui-util:1.0.3 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 -+| | +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| | +--- androidx.compose.ui:ui:1.0.3 (*) -+| | +--- androidx.compose.ui:ui-geometry:1.0.3 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.3 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 -+| +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| +--- androidx.compose.ui:ui:1.0.3 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 -+| +--- androidx.compose.foundation:foundation-layout:1.0.3 (*) -+| +--- androidx.compose.ui:ui-text:1.0.3 (*) -+| \--- androidx.compose.ui:ui-util:1.0.3 (*) -++--- androidx.compose.material:material:1.0.3 -+| +--- androidx.compose.animation:animation-core:1.0.3 (*) -+| +--- androidx.compose.foundation:foundation:1.0.3 (*) -+| +--- androidx.compose.material:material-icons-core:1.0.3 -+| | +--- androidx.compose.ui:ui:1.0.3 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) -+| +--- androidx.compose.material:material-ripple:1.0.3 -+| | +--- androidx.compose.foundation:foundation:1.0.3 (*) -+| | +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 -+| | +--- androidx.compose.animation:animation:1.0.3 (*) -+| | \--- androidx.compose.ui:ui-util:1.0.3 (*) -+| +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| +--- androidx.compose.ui:ui:1.0.3 (*) -+| +--- androidx.compose.ui:ui-text:1.0.3 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 -+| +--- androidx.compose.animation:animation:1.0.3 (*) -+| +--- androidx.compose.foundation:foundation-layout:1.0.3 (*) -+| \--- androidx.compose.ui:ui-util:1.0.3 (*) -++--- androidx.compose.runtime:runtime-livedata:1.0.3 -+| +--- androidx.compose.runtime:runtime:1.0.3 (*) ++| | | +--- androidx.compose.ui:ui:1.0.4 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| | | +--- androidx.compose.ui:ui-util:1.0.4 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 ++| | +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| | +--- androidx.compose.ui:ui:1.0.4 (*) ++| | +--- androidx.compose.ui:ui-geometry:1.0.4 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.4 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 ++| +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| +--- androidx.compose.ui:ui:1.0.4 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 ++| +--- androidx.compose.foundation:foundation-layout:1.0.4 (*) ++| +--- androidx.compose.ui:ui-text:1.0.4 (*) ++| \--- androidx.compose.ui:ui-util:1.0.4 (*) +++--- androidx.compose.material:material:1.0.4 ++| +--- androidx.compose.animation:animation-core:1.0.4 (*) ++| +--- androidx.compose.foundation:foundation:1.0.4 (*) ++| +--- androidx.compose.material:material-icons-core:1.0.4 ++| | +--- androidx.compose.ui:ui:1.0.4 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) ++| +--- androidx.compose.material:material-ripple:1.0.4 ++| | +--- androidx.compose.foundation:foundation:1.0.4 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 ++| | +--- androidx.compose.animation:animation:1.0.4 (*) ++| | \--- androidx.compose.ui:ui-util:1.0.4 (*) ++| +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| +--- androidx.compose.ui:ui:1.0.4 (*) ++| +--- androidx.compose.ui:ui-text:1.0.4 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 ++| +--- androidx.compose.animation:animation:1.0.4 (*) ++| +--- androidx.compose.foundation:foundation-layout:1.0.4 (*) ++| \--- androidx.compose.ui:ui-util:1.0.4 (*) +++--- androidx.compose.runtime:runtime-livedata:1.0.4 ++| +--- androidx.compose.runtime:runtime:1.0.4 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) -+| \--- androidx.compose.ui:ui:1.0.3 (*) -++--- com.google.android.material:compose-theme-adapter:1.0.2 ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) ++| \--- androidx.compose.ui:ui:1.0.4 (*) +++--- com.google.android.material:compose-theme-adapter:1.0.3 +| +--- androidx.appcompat:appcompat:1.3.0 -> 1.3.1 (*) +| +--- androidx.core:core-ktx:1.3.1 -> 1.3.2 (*) -+| +--- androidx.compose.runtime:runtime:1.0.2 -> 1.0.3 (*) -+| +--- androidx.compose.material:material:1.0.2 -> 1.0.3 (*) ++| +--- androidx.compose.runtime:runtime:1.0.3 -> 1.0.4 (*) ++| +--- androidx.compose.material:material:1.0.3 -> 1.0.4 (*) +| +--- com.google.android.material:material:1.1.0 -> 1.4.0 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.5.30 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.5.31 (*) +\--- androidx.activity:activity-compose:1.3.1 -+ +--- androidx.compose.runtime:runtime:1.0.1 -> 1.0.3 (*) -+ +--- androidx.compose.runtime:runtime-saveable:1.0.1 -> 1.0.3 (*) ++ +--- androidx.compose.runtime:runtime:1.0.1 -> 1.0.4 (*) ++ +--- androidx.compose.runtime:runtime-saveable:1.0.1 -> 1.0.4 (*) + +--- androidx.activity:activity-ktx:1.3.1 (*) -+ +--- androidx.compose.ui:ui:1.0.1 -> 1.0.3 (*) -+ \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.5.30 (*) ++ +--- androidx.compose.ui:ui:1.0.1 -> 1.0.4 (*) ++ \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.5.31 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index b1cbea5a4..ccb99a071 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -22,14 +22,14 @@ +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.0 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0 +| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.0 -> 1.5.30 -+| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.0 -> 1.5.31 ++| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 +| | | | | +--- org.jetbrains:annotations:13.0 -> 20.1.0 -+| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 -+| | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30 -+| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.0 -> 1.5.30 -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.0 -> 1.5.30 (*) ++| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 ++| | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31 ++| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.0 -> 1.5.31 ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.0 -> 1.5.31 (*) +| +--- androidx.lifecycle:lifecycle-extensions:2.2.0 +| | +--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.1 (*) +| | +--- androidx.arch.core:core-common:2.1.0 (*) @@ -93,11 +93,11 @@ +| | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 -> 2.3.1 (*) +| +--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 -> 2.3.1 +| | +--- androidx.lifecycle:lifecycle-runtime:2.3.1 (*) -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.30 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.31 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.0 (*) +| | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| +--- androidx.databinding:databinding-runtime:7.0.3 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32 -> 1.5.30 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32 -> 1.5.31 (*) ++--- com.google.firebase:firebase-crashlytics:18.2.1 +| +--- com.google.android.datatransport:transport-api:3.0.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 @@ -194,7 +194,7 @@ +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | +--- com.google.firebase:firebase-common:20.0.0 (*) +| | +--- com.google.firebase:firebase-components:17.0.0 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.5.30 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.5.31 (*) +| +--- com.google.firebase:firebase-components:17.0.0 (*) +| +--- com.google.firebase:firebase-config:21.0.1 +| | +--- com.google.android.gms:play-services-tasks:17.0.2 -> 17.2.0 (*) @@ -206,7 +206,7 @@ +| | \--- com.google.firebase:firebase-measurement-connector:18.0.0 -> 19.0.0 (*) +| +--- com.google.firebase:firebase-installations:17.0.0 (*) +| +--- com.google.firebase:firebase-installations-interop:17.0.0 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.5.30 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.5.31 (*) ++--- com.google.android.gms:play-services-location:18.0.0 +| +--- com.google.android.gms:play-services-base:17.5.0 +| | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) @@ -224,10 +224,10 @@ +| \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) ++--- com.android.billingclient:billing-ktx:3.0.3 +| +--- com.android.billingclient:billing:3.0.3 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.5.30 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.5.31 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.5.0 (*) ++--- com.gitlab.abaker:dav4jvm:deb2c9aef8 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.5.30 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.5.31 (*) +| \--- org.apache.commons:commons-lang3:3.8.1 ++--- com.gitlab.abaker:ical4android:0e928b567c +| +--- org.mnode.ical4j:ical4j:3.0.21 @@ -235,21 +235,21 @@ +| | +--- commons-codec:commons-codec:1.11 +| | +--- org.apache.commons:commons-lang3:3.8.1 +| | \--- org.apache.commons:commons-collections4:4.1 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.5.30 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.5.31 (*) +| +--- com.sun.mail:android-mail:1.6.5 +| | \--- com.sun.mail:android-activation:1.6.5 +| +--- commons-io:commons-io:2.6 +| +--- org.slf4j:slf4j-jdk14:1.7.30 +| | \--- org.slf4j:slf4j-api:1.7.30 +| \--- androidx.core:core-ktx:1.3.2 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.5.30 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.5.31 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| \--- androidx.core:core:1.3.2 -> 1.5.0 (*) ++--- com.gitlab.bitfireAT:cert4android:26a91a729f +| +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.3 +| +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.3 (*) +| +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.3 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.5.30 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.5.31 (*) +| +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.1 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | +--- androidx.core:core:1.5.0 (*) @@ -282,15 +282,15 @@ +| | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| +--- androidx.lifecycle:lifecycle-extensions:2.2.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata-ktx:2.2.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.5.30 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.5.31 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.5.0 (*) +| | +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| | \--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0 -> 2.3.1 +| | +--- androidx.lifecycle:lifecycle-livedata-core:2.3.1 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.30 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.31 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 -> 2.3.1 +| | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 (*) -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.30 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.31 (*) +| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.0 (*) +| +--- com.google.android.material:material:1.2.1 -> 1.4.0 +| | +--- androidx.annotation:annotation:1.0.1 -> 1.2.0 @@ -386,22 +386,22 @@ +| | +--- 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.5.30 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.5.30 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.31 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.5.31 (*) +| +--- 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.5.30 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.5.31 (*) +| | \--- androidx.collection:collection:1.1.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.3.1 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1 (*) +| +--- androidx.savedstate:savedstate-ktx:1.1.0 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.30 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.31 (*) ++--- 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.4.0-alpha05 +| +--- androidx.room:room-common:2.4.0-alpha05 (*) +| +--- androidx.room:room-runtime:2.4.0-alpha05 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.5.31 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0 (*) ++--- androidx.appcompat:appcompat:1.3.1 (*) ++--- io.reactivex.rxjava2:rxandroid:2.1.1 @@ -432,15 +432,15 @@ +| \--- com.atlassian.commonmark:commonmark:0.13.0 ++--- io.noties.markwon:linkify:4.6.2 +| \--- io.noties.markwon:core:4.6.2 (*) -++--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30 (*) +++--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31 (*) ++--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.4 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.5.30 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.5.30 ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.5.31 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.5.31 ++--- com.squareup.okhttp3:okhttp:4.8.1 +| +--- com.squareup.okio:okio:2.7.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.5.30 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.5.30 -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.5.30 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.5.31 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.5.31 ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.5.31 (*) ++--- com.google.code.gson:gson:2.8.8 ++--- com.google.android.material:material:1.4.0 (*) ++--- androidx.constraintlayout:constraintlayout:2.1.0 (*) @@ -456,7 +456,7 @@ +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) ++--- com.jakewharton.timber:timber:5.0.1 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.5.30 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.5.31 (*) +| \--- org.jetbrains:annotations:20.1.0 ++--- com.google.android.apps.dashclock:dashclock-api:2.0.0 ++--- com.twofortyfouram:android-plugin-api-for-locale:1.0.2 @@ -491,10 +491,10 @@ ++--- androidx.work:work-runtime:2.7.0-beta01 (*) ++--- androidx.work:work-runtime-ktx:2.7.0-beta01 +| +--- androidx.work:work-runtime:2.7.0-beta01 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.5.30 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.5.31 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0 (*) ++--- com.etesync:journalmanager:1.1.1 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.5.30 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.5.31 (*) +| +--- com.madgag.spongycastle:core:1.54.0.0 +| +--- com.madgag.spongycastle:prov:1.54.0.0 +| | \--- com.madgag.spongycastle:core:1.54.0.0 @@ -521,49 +521,49 @@ +| +--- 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.11 -++--- androidx.compose.ui:ui:1.0.3 -+| +--- androidx.compose.runtime:runtime-saveable:1.0.3 -+| | +--- androidx.compose.runtime:runtime:1.0.3 +++--- androidx.compose.ui:ui:1.0.4 ++| +--- androidx.compose.runtime:runtime-saveable:1.0.4 ++| | +--- androidx.compose.runtime:runtime:1.0.4 +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0 (*) +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) -+| +--- androidx.compose.ui:ui-geometry:1.0.3 ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) ++| +--- androidx.compose.ui:ui-geometry:1.0.4 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.3 -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) -+| +--- androidx.compose.ui:ui-graphics:1.0.3 ++| | +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.4 ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) ++| +--- androidx.compose.ui:ui-graphics:1.0.4 +| | +--- androidx.annotation:annotation:1.2.0 -+| | +--- androidx.compose.ui:ui-unit:1.0.3 -+| | | +--- androidx.compose.ui:ui-geometry:1.0.3 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.4 ++| | | +--- androidx.compose.ui:ui-geometry:1.0.4 (*) +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) -+| | | +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| | | \--- androidx.compose.ui:ui-util:1.0.3 (*) -+| | +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.3 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 -+| +--- androidx.compose.ui:ui-text:1.0.3 -+| | +--- androidx.compose.ui:ui-graphics:1.0.3 (*) -+| | +--- androidx.compose.ui:ui-unit:1.0.3 (*) ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| | | \--- androidx.compose.ui:ui-util:1.0.4 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.4 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 ++| +--- androidx.compose.ui:ui-text:1.0.4 ++| | +--- androidx.compose.ui:ui-graphics:1.0.4 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.4 (*) +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 -+| | +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| | +--- androidx.compose.runtime:runtime-saveable:1.0.3 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.3 (*) -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 ++| | +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| | +--- androidx.compose.runtime:runtime-saveable:1.0.4 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.4 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) +| | +--- androidx.collection:collection:1.1.0 (*) +| | \--- androidx.core:core:1.5.0 (*) -+| +--- androidx.compose.ui:ui-unit:1.0.3 (*) ++| +--- androidx.compose.ui:ui-unit:1.0.4 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0 (*) -+| +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| +--- androidx.compose.ui:ui-util:1.0.3 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) ++| +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| +--- androidx.compose.ui:ui-util:1.0.4 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) +| +--- androidx.autofill:autofill:1.0.0 +| | \--- androidx.core:core:1.1.0 -> 1.5.0 (*) +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0 (*) @@ -573,72 +573,72 @@ +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| +--- androidx.lifecycle:lifecycle-runtime:2.3.0 -> 2.3.1 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 -> 2.3.1 (*) -+| \--- androidx.profileinstaller:profileinstaller:1.0.3 ++| \--- androidx.profileinstaller:profileinstaller:1.0.4 +| +--- androidx.annotation:annotation:1.2.0 +| \--- androidx.startup:startup-runtime:1.0.0 (*) -++--- androidx.compose.foundation:foundation:1.0.3 +++--- androidx.compose.foundation:foundation:1.0.4 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- androidx.compose.animation:animation:1.0.3 ++| +--- androidx.compose.animation:animation:1.0.4 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | +--- androidx.compose.animation:animation-core:1.0.3 ++| | +--- androidx.compose.animation:animation-core:1.0.4 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0 (*) -+| | | +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| | | +--- androidx.compose.ui:ui:1.0.3 (*) -+| | | +--- androidx.compose.ui:ui-unit:1.0.3 (*) -+| | | +--- androidx.compose.ui:ui-util:1.0.3 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) -+| | +--- androidx.compose.foundation:foundation-layout:1.0.3 ++| | | +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| | | +--- androidx.compose.ui:ui:1.0.4 (*) ++| | | +--- androidx.compose.ui:ui-unit:1.0.4 (*) ++| | | +--- androidx.compose.ui:ui-util:1.0.4 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) ++| | +--- androidx.compose.foundation:foundation-layout:1.0.4 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.compose.ui:ui:1.0.3 (*) -+| | | +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| | | +--- androidx.compose.ui:ui-util:1.0.3 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 -+| | +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| | +--- androidx.compose.ui:ui:1.0.3 (*) -+| | +--- androidx.compose.ui:ui-geometry:1.0.3 (*) -+| | +--- androidx.compose.ui:ui-util:1.0.3 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 -+| +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| +--- androidx.compose.ui:ui:1.0.3 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 -+| +--- androidx.compose.foundation:foundation-layout:1.0.3 (*) -+| +--- androidx.compose.ui:ui-text:1.0.3 (*) -+| \--- androidx.compose.ui:ui-util:1.0.3 (*) -++--- androidx.compose.material:material:1.0.3 -+| +--- androidx.compose.animation:animation-core:1.0.3 (*) -+| +--- androidx.compose.foundation:foundation:1.0.3 (*) -+| +--- androidx.compose.material:material-icons-core:1.0.3 -+| | +--- androidx.compose.ui:ui:1.0.3 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) -+| +--- androidx.compose.material:material-ripple:1.0.3 -+| | +--- androidx.compose.foundation:foundation:1.0.3 (*) -+| | +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 -+| | +--- androidx.compose.animation:animation:1.0.3 (*) -+| | \--- androidx.compose.ui:ui-util:1.0.3 (*) -+| +--- androidx.compose.runtime:runtime:1.0.3 (*) -+| +--- androidx.compose.ui:ui:1.0.3 (*) -+| +--- androidx.compose.ui:ui-text:1.0.3 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 -+| +--- androidx.compose.animation:animation:1.0.3 (*) -+| +--- androidx.compose.foundation:foundation-layout:1.0.3 (*) -+| \--- androidx.compose.ui:ui-util:1.0.3 (*) -++--- androidx.compose.runtime:runtime-livedata:1.0.3 -+| +--- androidx.compose.runtime:runtime:1.0.3 (*) ++| | | +--- androidx.compose.ui:ui:1.0.4 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| | | +--- androidx.compose.ui:ui-util:1.0.4 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 ++| | +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| | +--- androidx.compose.ui:ui:1.0.4 (*) ++| | +--- androidx.compose.ui:ui-geometry:1.0.4 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.4 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 ++| +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| +--- androidx.compose.ui:ui:1.0.4 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 ++| +--- androidx.compose.foundation:foundation-layout:1.0.4 (*) ++| +--- androidx.compose.ui:ui-text:1.0.4 (*) ++| \--- androidx.compose.ui:ui-util:1.0.4 (*) +++--- androidx.compose.material:material:1.0.4 ++| +--- androidx.compose.animation:animation-core:1.0.4 (*) ++| +--- androidx.compose.foundation:foundation:1.0.4 (*) ++| +--- androidx.compose.material:material-icons-core:1.0.4 ++| | +--- androidx.compose.ui:ui:1.0.4 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) ++| +--- androidx.compose.material:material-ripple:1.0.4 ++| | +--- androidx.compose.foundation:foundation:1.0.4 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 ++| | +--- androidx.compose.animation:animation:1.0.4 (*) ++| | \--- androidx.compose.ui:ui-util:1.0.4 (*) ++| +--- androidx.compose.runtime:runtime:1.0.4 (*) ++| +--- androidx.compose.ui:ui:1.0.4 (*) ++| +--- androidx.compose.ui:ui-text:1.0.4 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 ++| +--- androidx.compose.animation:animation:1.0.4 (*) ++| +--- androidx.compose.foundation:foundation-layout:1.0.4 (*) ++| \--- androidx.compose.ui:ui-util:1.0.4 (*) +++--- androidx.compose.runtime:runtime-livedata:1.0.4 ++| +--- androidx.compose.runtime:runtime:1.0.4 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) -+| \--- androidx.compose.ui:ui:1.0.3 (*) -++--- com.google.android.material:compose-theme-adapter:1.0.2 ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.31 (*) ++| \--- androidx.compose.ui:ui:1.0.4 (*) +++--- com.google.android.material:compose-theme-adapter:1.0.3 +| +--- androidx.appcompat:appcompat:1.3.0 -> 1.3.1 (*) +| +--- androidx.core:core-ktx:1.3.1 -> 1.3.2 (*) -+| +--- androidx.compose.runtime:runtime:1.0.2 -> 1.0.3 (*) -+| +--- androidx.compose.material:material:1.0.2 -> 1.0.3 (*) ++| +--- androidx.compose.runtime:runtime:1.0.3 -> 1.0.4 (*) ++| +--- androidx.compose.material:material:1.0.3 -> 1.0.4 (*) +| +--- com.google.android.material:material:1.1.0 -> 1.4.0 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.5.30 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.5.31 (*) +\--- androidx.activity:activity-compose:1.3.1 -+ +--- androidx.compose.runtime:runtime:1.0.1 -> 1.0.3 (*) -+ +--- androidx.compose.runtime:runtime-saveable:1.0.1 -> 1.0.3 (*) ++ +--- androidx.compose.runtime:runtime:1.0.1 -> 1.0.4 (*) ++ +--- androidx.compose.runtime:runtime-saveable:1.0.1 -> 1.0.4 (*) + +--- androidx.activity:activity-ktx:1.3.1 (*) -+ +--- androidx.compose.ui:ui:1.0.1 -> 1.0.3 (*) -+ \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.5.30 (*) ++ +--- androidx.compose.ui:ui:1.0.1 -> 1.0.4 (*) ++ \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.5.31 (*)