diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9eeb24131..4fc48738a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -197,7 +197,7 @@ dependencies { debugImplementation("androidx.compose.ui:ui-tooling:${Versions.compose}") debugImplementation("org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}") - implementation("org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Versions.kotlin}") implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.4") implementation("com.squareup.okhttp3:okhttp:${Versions.okhttp}") implementation("com.google.code.gson:gson:2.8.6") diff --git a/app/src/main/java/org/tasks/location/PlaceSearchGoogle.kt b/app/src/main/java/org/tasks/location/PlaceSearchGoogle.kt index 83d76ea20..08e6ebbfa 100644 --- a/app/src/main/java/org/tasks/location/PlaceSearchGoogle.kt +++ b/app/src/main/java/org/tasks/location/PlaceSearchGoogle.kt @@ -28,7 +28,7 @@ class PlaceSearchGoogle @Inject constructor( private var token: String? = null override fun restoreState(savedInstanceState: Bundle?) { - token = savedInstanceState?.getParcelable(EXTRA_SESSION_TOKEN) + token = savedInstanceState?.getString(EXTRA_SESSION_TOKEN) } override fun saveState(outState: Bundle) { diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index fa4b840a2..6da3bbdaf 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.4.32" + const val kotlin = "1.5.10" const val targetSdk = 30 const val minSdk = 24 const val work = "2.5.0" @@ -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-beta07" + const val compose = "1.0.0-beta08" } \ No newline at end of file diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 17694980f..ea37f6d6d 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -22,18 +22,18 @@ +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3 +| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.3 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.4.32 -+| | | | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| | | | \--- org.jetbrains:annotations:13.0 -> 16.0.1 -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.4.32 -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.4.32 (*) ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.5.10 ++| | | | +--- org.jetbrains:annotations:13.0 -> 16.0.1 ++| | | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10 ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.5.10 ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.5.10 (*) +| +--- 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 (*) +| | +--- androidx.arch.core:core-runtime:2.1.0 (*) +| | +--- androidx.fragment:fragment:1.2.0 -> 1.3.2 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 ++| | | +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 +| | | | +--- androidx.annotation:annotation:1.2.0 +| | | | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.1 (*) +| | | | +--- androidx.versionedparcelable:versionedparcelable:1.1.1 @@ -43,13 +43,13 @@ +| | | +--- androidx.collection:collection:1.1.0 (*) +| | | +--- androidx.viewpager:viewpager:1.0.0 +| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc01 (*) ++| | | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*) +| | | | \--- androidx.customview:customview:1.0.0 +| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | | \--- androidx.core:core:1.0.0 -> 1.5.0-rc01 (*) ++| | | | \--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*) +| | | +--- androidx.loader:loader:1.0.0 +| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc01 (*) ++| | | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*) +| | | | +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.2.0 +| | | | | +--- androidx.arch.core:core-runtime:2.1.0 (*) +| | | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.2.0 -> 2.3.1 @@ -61,7 +61,7 @@ +| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | | +--- 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.core:core:1.1.0 -> 1.5.0-rc02 (*) +| | | | +--- androidx.lifecycle:lifecycle-runtime:2.3.1 (*) +| | | | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 (*) +| | | | +--- androidx.savedstate:savedstate:1.1.0 @@ -90,16 +90,16 @@ +| | \--- 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.4.32 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.10 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*) +| | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| +--- androidx.databinding:databinding-runtime:7.0.0-beta03 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32 -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32 -> 1.5.10 ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.10 ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) ++--- com.gitlab.abaker:dav4jvm:deb2c9aef8 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.4.32 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.5.10 (*) +| \--- org.apache.commons:commons-lang3:3.8.1 ++--- com.gitlab.abaker:ical4android:0e928b567c +| +--- org.mnode.ical4j:ical4j:3.0.21 @@ -107,24 +107,24 @@ +| | +--- 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.4.32 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.5.10 (*) +| +--- 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.4.32 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.5.10 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| \--- androidx.core:core:1.3.2 -> 1.5.0-rc01 (*) ++| \--- androidx.core:core:1.3.2 -> 1.5.0-rc02 (*) ++--- com.gitlab.bitfireAT:cert4android:26a91a729f +| +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-beta03 +| +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-beta03 (*) +| +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-beta03 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.32 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.5.10 (*) +| +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-rc01 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | +--- androidx.core:core:1.5.0-rc01 (*) ++| | +--- androidx.core:core:1.5.0-rc01 -> 1.5.0-rc02 (*) +| | +--- androidx.cursoradapter:cursoradapter:1.0.0 +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| | +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha08 (*) @@ -132,10 +132,10 @@ +| | +--- androidx.appcompat:appcompat-resources:1.3.0-rc01 +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.core:core:1.0.1 -> 1.5.0-rc01 (*) ++| | | +--- androidx.core:core:1.0.1 -> 1.5.0-rc02 (*) +| | | +--- androidx.vectordrawable:vectordrawable:1.1.0 +| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | | +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) ++| | | | +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*) +| | | | \--- androidx.collection:collection:1.1.0 (*) +| | | \--- androidx.vectordrawable:vectordrawable-animated:1.1.0 +| | | +--- androidx.vectordrawable:vectordrawable:1.1.0 (*) @@ -144,7 +144,7 @@ +| | | \--- androidx.collection:collection:1.1.0 (*) +| | +--- androidx.drawerlayout:drawerlayout:1.0.0 +| | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc01 (*) ++| | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*) +| | | \--- androidx.customview:customview:1.0.0 (*) +| | +--- androidx.savedstate:savedstate:1.1.0 (*) +| | +--- androidx.collection:collection:1.0.0 -> 1.1.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.4.32 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.5.10 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.4.3 (*) +| | +--- 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.4.32 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.10 (*) +| +--- 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.4.32 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.10 (*) +| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*) +| +--- com.google.android.material:material:1.2.1 -> 1.3.0 +| | +--- androidx.annotation:annotation:1.0.1 -> 1.2.0 @@ -170,20 +170,20 @@ +| | +--- androidx.cardview:cardview:1.0.0 (*) +| | +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) ++| | | +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*) +| | | +--- androidx.customview:customview:1.0.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | +--- androidx.constraintlayout:constraintlayout:2.0.1 -> 2.1.0-beta01 +| | | +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-rc01 (*) -+| | | +--- androidx.core:core:1.3.2 -> 1.5.0-rc01 (*) ++| | | +--- androidx.core:core:1.3.2 -> 1.5.0-rc02 (*) +| | | \--- androidx.constraintlayout:constraintlayout-core:1.0.0-beta01 -+| | +--- androidx.core:core:1.2.0 -> 1.5.0-rc01 (*) ++| | +--- androidx.core:core:1.2.0 -> 1.5.0-rc02 (*) +| | +--- androidx.dynamicanimation:dynamicanimation:1.0.0 -+| | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc01 (*) ++| | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*) +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | | \--- androidx.legacy:legacy-support-core-utils:1.0.0 +| | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc01 (*) ++| | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*) +| | | +--- androidx.documentfile:documentfile:1.0.0 +| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| | | +--- androidx.loader:loader:1.0.0 (*) @@ -196,19 +196,19 @@ +| | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.1 (*) +| | +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) ++| | | +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*) +| | | +--- androidx.customview:customview:1.0.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | +--- androidx.transition:transition:1.2.0 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.core:core:1.0.1 -> 1.5.0-rc01 (*) ++| | | +--- androidx.core:core:1.0.1 -> 1.5.0-rc02 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | +--- androidx.vectordrawable:vectordrawable:1.1.0 (*) +| | \--- androidx.viewpager2:viewpager2:1.0.0 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | +--- androidx.fragment:fragment:1.1.0 -> 1.3.2 (*) +| | +--- androidx.recyclerview:recyclerview:1.1.0 (*) -+| | +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) ++| | +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*) +| | \--- androidx.collection:collection:1.1.0 (*) +| \--- org.conscrypt:conscrypt-android:2.5.1 ++--- com.github.dmfs.opentasks:opentasks-provider:1.2.4 @@ -250,7 +250,7 @@ +| | | \--- androidx.annotation:annotation-experimental:1.1.0 +| | +--- androidx.sqlite:sqlite:2.1.0 (*) +| | +--- androidx.sqlite:sqlite-framework:2.1.0 (*) -+| | +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) ++| | +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*) +| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*) +| \--- com.google.dagger:hilt-android:2.35 -> 2.36 (*) ++--- androidx.fragment:fragment-ktx:1.3.2 @@ -262,22 +262,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.4.32 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.10 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 -> 1.5.10 (*) +| +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) +| +--- androidx.collection:collection-ktx:1.1.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.4.32 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.5.10 (*) +| | \--- 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.4.32 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.10 (*) ++--- 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.3.0 +| +--- androidx.room:room-common:2.3.0 (*) +| +--- androidx.room:room-runtime:2.3.0 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.5.10 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*) ++--- androidx.appcompat:appcompat:1.3.0-rc01 (*) ++--- io.reactivex.rxjava2:rxandroid:2.1.1 @@ -308,25 +308,25 @@ +| \--- 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:1.4.32 (*) +++--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.10 (*) ++--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.4 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.4.32 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.4.32 ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.5.10 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.5.10 ++--- com.squareup.okhttp3:okhttp:4.8.1 +| +--- com.squareup.okio:okio:2.7.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.4.32 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.4.32 -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.4.32 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.5.10 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.5.10 ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.5.10 (*) ++--- com.google.code.gson:gson:2.8.6 ++--- com.google.android.material:material:1.3.0 (*) ++--- androidx.constraintlayout:constraintlayout:2.1.0-beta01 (*) ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) ++| +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*) +| \--- androidx.interpolator:interpolator:1.0.0 (*) ++--- androidx.preference:preference:1.1.1 +| +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-rc01 (*) -+| +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) ++| +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*) +| +--- androidx.fragment:fragment:1.2.4 -> 1.3.2 (*) +| +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 @@ -364,10 +364,10 @@ ++--- androidx.work:work-runtime:2.5.0 (*) ++--- androidx.work:work-runtime-ktx:2.5.0 +| +--- androidx.work:work-runtime:2.5.0 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.4.32 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.5.10 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*) ++--- com.etesync:journalmanager:1.1.1 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.4.32 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.5.10 (*) +| +--- com.madgag.spongycastle:core:1.54.0.0 +| +--- com.madgag.spongycastle:prov:1.54.0.0 +| | \--- com.madgag.spongycastle:core:1.54.0.0 @@ -390,123 +390,122 @@ +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| +--- androidx.interpolator:interpolator:1.0.0 (*) -+| +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) ++| +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*) +| +--- 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-beta07 -+| +--- androidx.compose.animation:animation-core:1.0.0-beta07 +++--- androidx.compose.ui:ui:1.0.0-beta08 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta08 +| | +--- 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-beta07 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta08 +| | | +--- 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-beta07 -+| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta07 ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta08 ++| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta08 +| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | | +--- 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.compose.runtime:runtime:1.0.0-beta08 (*) ++| | | | +--- androidx.compose.ui:ui-util:1.0.0-beta08 ++| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) ++| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| | | +--- 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-beta07 -+| | +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) ++| | | \--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) ++| +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta08 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) +| | +--- 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-beta07 (*) -+| +--- androidx.compose.ui:ui-graphics:1.0.0-beta07 ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) ++| +--- androidx.compose.ui:ui-geometry:1.0.0-beta08 (*) ++| +--- androidx.compose.ui:ui-graphics:1.0.0-beta08 +| | +--- androidx.annotation:annotation:1.2.0-beta01 -> 1.2.0 -+| | +--- 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-beta07 -+| | +--- androidx.compose.ui:ui-graphics:1.0.0-beta07 (*) -+| | +--- androidx.compose.ui:ui-unit:1.0.0-beta07 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta08 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10 ++| +--- androidx.compose.ui:ui-text:1.0.0-beta08 ++| | +--- androidx.compose.ui:ui-graphics:1.0.0-beta08 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta08 (*) +| | +--- 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-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 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) ++| | +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta08 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) +| | +--- 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-beta07 (*) ++| | \--- androidx.core:core:1.5.0-rc02 (*) ++| +--- androidx.compose.ui:ui-unit:1.0.0-beta08 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3 (*) -+| +--- 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.compose.runtime:runtime:1.0.0-beta08 (*) ++| +--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) +| +--- androidx.autofill:autofill:1.0.0 -+| | \--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) ++| | \--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*) +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3 (*) +| +--- 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-beta07 +++--- androidx.compose.foundation:foundation:1.0.0-beta08 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- androidx.compose.animation:animation:1.0.0-beta07 ++| +--- androidx.compose.animation:animation:1.0.0-beta08 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | +--- androidx.compose.animation:animation-core:1.0.0-beta07 (*) -+| | +--- androidx.compose.foundation:foundation-layout:1.0.0-beta07 ++| | +--- androidx.compose.animation:animation-core:1.0.0-beta08 (*) ++| | +--- androidx.compose.foundation:foundation-layout:1.0.0-beta08 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- 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-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-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-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-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-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-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.compose.ui:ui:1.0.0-beta08 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) ++| | | +--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) ++| | +--- androidx.compose.ui:ui:1.0.0-beta08 (*) ++| | +--- androidx.compose.ui:ui-geometry:1.0.0-beta08 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10 ++| +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) ++| +--- androidx.compose.ui:ui:1.0.0-beta08 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10 ++| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta08 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta08 (*) ++| \--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) +++--- androidx.compose.material:material:1.0.0-beta08 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta08 (*) ++| +--- androidx.compose.foundation:foundation:1.0.0-beta08 (*) ++| +--- androidx.compose.material:material-icons-core:1.0.0-beta08 ++| | +--- androidx.compose.ui:ui:1.0.0-beta08 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) ++| +--- androidx.compose.material:material-ripple:1.0.0-beta08 ++| | +--- androidx.compose.foundation:foundation:1.0.0-beta08 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10 ++| | +--- androidx.compose.animation:animation:1.0.0-beta08 (*) ++| | \--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) ++| +--- androidx.compose.ui:ui:1.0.0-beta08 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta08 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10 ++| +--- androidx.compose.animation:animation:1.0.0-beta08 (*) ++| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta08 (*) ++| \--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) +++--- androidx.compose.runtime:runtime-livedata:1.0.0-beta08 ++| +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| \--- androidx.compose.ui:ui:1.0.0-beta07 (*) -++--- com.google.android.material:compose-theme-adapter:1.0.0-beta07 ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) ++| \--- androidx.compose.ui:ui:1.0.0-beta08 (*) +++--- com.google.android.material:compose-theme-adapter:1.0.0-beta08 +| +--- 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-beta07 (*) -+| +--- androidx.compose.material:material:1.0.0-beta07 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) ++| +--- androidx.compose.material:material:1.0.0-beta08 (*) +| +--- com.google.android.material:material:1.1.0 -> 1.3.0 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) +\--- 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.compose.runtime:runtime:1.0.0-beta07 -> 1.0.0-beta08 (*) ++ +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta07 -> 1.0.0-beta08 (*) + +--- androidx.activity:activity-ktx:1.3.0-alpha08 (*) -+ +--- androidx.compose.ui:ui:1.0.0-beta07 (*) -+ \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) ++ +--- androidx.compose.ui:ui:1.0.0-beta07 -> 1.0.0-beta08 (*) ++ \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 -> 1.5.10 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 13a6ed8ae..7026032d4 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -22,18 +22,18 @@ +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3 +| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.3 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.4.32 -+| | | | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 -+| | | | \--- org.jetbrains:annotations:13.0 -> 16.0.1 -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.4.32 -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.4.32 (*) ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.5.10 ++| | | | +--- org.jetbrains:annotations:13.0 -> 16.0.1 ++| | | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10 ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.5.10 ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.5.10 (*) +| +--- 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 (*) +| | +--- androidx.arch.core:core-runtime:2.1.0 (*) +| | +--- androidx.fragment:fragment:1.2.0 -> 1.3.2 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 ++| | | +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 +| | | | +--- androidx.annotation:annotation:1.2.0 +| | | | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.1 (*) +| | | | +--- androidx.versionedparcelable:versionedparcelable:1.1.1 @@ -43,13 +43,13 @@ +| | | +--- androidx.collection:collection:1.1.0 (*) +| | | +--- androidx.viewpager:viewpager:1.0.0 +| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc01 (*) ++| | | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*) +| | | | \--- androidx.customview:customview:1.0.0 +| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | | \--- androidx.core:core:1.0.0 -> 1.5.0-rc01 (*) ++| | | | \--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*) +| | | +--- androidx.loader:loader:1.0.0 +| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc01 (*) ++| | | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*) +| | | | +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.2.0 +| | | | | +--- androidx.arch.core:core-runtime:2.1.0 (*) +| | | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.2.0 -> 2.3.1 @@ -61,7 +61,7 @@ +| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | | +--- 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.core:core:1.1.0 -> 1.5.0-rc02 (*) +| | | | +--- androidx.lifecycle:lifecycle-runtime:2.3.1 (*) +| | | | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 (*) +| | | | +--- androidx.savedstate:savedstate:1.1.0 @@ -90,14 +90,14 @@ +| | \--- 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.4.32 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.10 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*) +| | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| +--- androidx.databinding:databinding-runtime:7.0.0-beta03 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32 -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32 -> 1.5.10 ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.10 ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) ++--- com.google.firebase:firebase-crashlytics:17.4.1 +| +--- com.google.android.datatransport:transport-api:2.2.1 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 @@ -117,7 +117,7 @@ +| +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.2.0 +| | \--- com.google.android.gms:play-services-basement:17.4.0 -> 17.5.0 +| | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) -+| | +--- androidx.core:core:1.2.0 -> 1.5.0-rc01 (*) ++| | +--- androidx.core:core:1.2.0 -> 1.5.0-rc02 (*) +| | \--- androidx.fragment:fragment:1.0.0 -> 1.3.2 (*) +| +--- com.google.firebase:firebase-common:19.5.0 +| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) @@ -143,7 +143,7 @@ +| | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | +--- androidx.legacy:legacy-support-core-utils:1.0.0 +| | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc01 (*) ++| | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*) +| | | +--- androidx.documentfile:documentfile:1.0.0 +| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| | | +--- androidx.loader:loader:1.0.0 (*) @@ -156,7 +156,7 @@ +| | | \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) +| | +--- com.google.android.gms:play-services-measurement-impl:18.0.3 +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) -+| | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc01 (*) ++| | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*) +| | | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*) +| | | +--- com.google.android.gms:play-services-measurement-base:18.0.3 (*) +| | | \--- com.google.android.gms:play-services-stats:17.0.0 @@ -192,7 +192,7 @@ +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | +--- com.google.firebase:firebase-common:19.5.0 (*) +| | +--- com.google.firebase:firebase-components:16.1.0 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.4.32 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.5.10 (*) +| +--- com.google.firebase:firebase-components:16.1.0 (*) +| +--- com.google.firebase:firebase-config:20.0.4 +| | +--- com.google.android.gms:play-services-tasks:17.0.2 -> 17.2.0 (*) @@ -204,11 +204,11 @@ +| | \--- com.google.firebase:firebase-measurement-connector:18.0.0 (*) +| +--- com.google.firebase:firebase-installations:16.3.5 (*) +| +--- com.google.firebase:firebase-installations-interop:16.0.1 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.4.32 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.5.10 (*) ++--- 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 (*) -+| | +--- androidx.core:core:1.2.0 -> 1.5.0-rc01 (*) ++| | +--- androidx.core:core:1.2.0 -> 1.5.0-rc02 (*) +| | +--- androidx.fragment:fragment:1.0.0 -> 1.3.2 (*) +| | +--- com.google.android.gms:play-services-basement:17.5.0 (*) +| | \--- com.google.android.gms:play-services-tasks:17.2.0 (*) @@ -222,10 +222,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.4.32 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.5.10 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.4.3 (*) ++--- com.gitlab.abaker:dav4jvm:deb2c9aef8 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.4.32 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.5.10 (*) +| \--- org.apache.commons:commons-lang3:3.8.1 ++--- com.gitlab.abaker:ical4android:0e928b567c +| +--- org.mnode.ical4j:ical4j:3.0.21 @@ -233,24 +233,24 @@ +| | +--- 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.4.32 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.5.10 (*) +| +--- 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.4.32 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.5.10 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| \--- androidx.core:core:1.3.2 -> 1.5.0-rc01 (*) ++| \--- androidx.core:core:1.3.2 -> 1.5.0-rc02 (*) ++--- com.gitlab.bitfireAT:cert4android:26a91a729f +| +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-beta03 +| +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-beta03 (*) +| +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-beta03 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.32 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.5.10 (*) +| +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-rc01 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | +--- androidx.core:core:1.5.0-rc01 (*) ++| | +--- androidx.core:core:1.5.0-rc01 -> 1.5.0-rc02 (*) +| | +--- androidx.cursoradapter:cursoradapter:1.0.0 +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| | +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha08 (*) @@ -258,10 +258,10 @@ +| | +--- androidx.appcompat:appcompat-resources:1.3.0-rc01 +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.core:core:1.0.1 -> 1.5.0-rc01 (*) ++| | | +--- androidx.core:core:1.0.1 -> 1.5.0-rc02 (*) +| | | +--- androidx.vectordrawable:vectordrawable:1.1.0 +| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | | +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) ++| | | | +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*) +| | | | \--- androidx.collection:collection:1.1.0 (*) +| | | \--- androidx.vectordrawable:vectordrawable-animated:1.1.0 +| | | +--- androidx.vectordrawable:vectordrawable:1.1.0 (*) @@ -270,7 +270,7 @@ +| | | \--- androidx.collection:collection:1.1.0 (*) +| | +--- androidx.drawerlayout:drawerlayout:1.0.0 +| | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc01 (*) ++| | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*) +| | | \--- androidx.customview:customview:1.0.0 (*) +| | +--- androidx.savedstate:savedstate:1.1.0 (*) +| | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) @@ -280,15 +280,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.4.32 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.5.10 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.4.3 (*) +| | +--- 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.4.32 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.10 (*) +| +--- 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.4.32 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.10 (*) +| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*) +| +--- com.google.android.material:material:1.2.1 -> 1.3.0 +| | +--- androidx.annotation:annotation:1.0.1 -> 1.2.0 @@ -296,16 +296,16 @@ +| | +--- androidx.cardview:cardview:1.0.0 (*) +| | +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) ++| | | +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*) +| | | +--- androidx.customview:customview:1.0.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | +--- androidx.constraintlayout:constraintlayout:2.0.1 -> 2.1.0-beta01 +| | | +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-rc01 (*) -+| | | +--- androidx.core:core:1.3.2 -> 1.5.0-rc01 (*) ++| | | +--- androidx.core:core:1.3.2 -> 1.5.0-rc02 (*) +| | | \--- androidx.constraintlayout:constraintlayout-core:1.0.0-beta01 -+| | +--- androidx.core:core:1.2.0 -> 1.5.0-rc01 (*) ++| | +--- androidx.core:core:1.2.0 -> 1.5.0-rc02 (*) +| | +--- androidx.dynamicanimation:dynamicanimation:1.0.0 -+| | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc01 (*) ++| | | +--- androidx.core:core:1.0.0 -> 1.5.0-rc02 (*) +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | | \--- androidx.legacy:legacy-support-core-utils:1.0.0 (*) +| | +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0 @@ -313,19 +313,19 @@ +| | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.1 (*) +| | +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) ++| | | +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*) +| | | +--- androidx.customview:customview:1.0.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | +--- androidx.transition:transition:1.2.0 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.core:core:1.0.1 -> 1.5.0-rc01 (*) ++| | | +--- androidx.core:core:1.0.1 -> 1.5.0-rc02 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | +--- androidx.vectordrawable:vectordrawable:1.1.0 (*) +| | \--- androidx.viewpager2:viewpager2:1.0.0 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | +--- androidx.fragment:fragment:1.1.0 -> 1.3.2 (*) +| | +--- androidx.recyclerview:recyclerview:1.1.0 (*) -+| | +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) ++| | +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*) +| | \--- androidx.collection:collection:1.1.0 (*) +| \--- org.conscrypt:conscrypt-android:2.5.1 ++--- com.github.dmfs.opentasks:opentasks-provider:1.2.4 @@ -367,7 +367,7 @@ +| | | \--- androidx.annotation:annotation-experimental:1.1.0 +| | +--- androidx.sqlite:sqlite:2.1.0 (*) +| | +--- androidx.sqlite:sqlite-framework:2.1.0 (*) -+| | +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) ++| | +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*) +| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*) +| \--- com.google.dagger:hilt-android:2.35 -> 2.36 (*) ++--- androidx.fragment:fragment-ktx:1.3.2 @@ -379,22 +379,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.4.32 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.10 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 -> 1.5.10 (*) +| +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) +| +--- androidx.collection:collection-ktx:1.1.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.4.32 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.5.10 (*) +| | \--- 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.4.32 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.10 (*) ++--- 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.3.0 +| +--- androidx.room:room-common:2.3.0 (*) +| +--- androidx.room:room-runtime:2.3.0 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.5.10 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*) ++--- androidx.appcompat:appcompat:1.3.0-rc01 (*) ++--- io.reactivex.rxjava2:rxandroid:2.1.1 @@ -425,25 +425,25 @@ +| \--- 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:1.4.32 (*) +++--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.10 (*) ++--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.4 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.4.32 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.4.32 ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.5.10 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.5.10 ++--- com.squareup.okhttp3:okhttp:4.8.1 +| +--- com.squareup.okio:okio:2.7.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.4.32 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.4.32 -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.4.32 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.5.10 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.5.10 ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.5.10 (*) ++--- com.google.code.gson:gson:2.8.6 ++--- com.google.android.material:material:1.3.0 (*) ++--- androidx.constraintlayout:constraintlayout:2.1.0-beta01 (*) ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) ++| +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*) +| \--- androidx.interpolator:interpolator:1.0.0 (*) ++--- androidx.preference:preference:1.1.1 +| +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-rc01 (*) -+| +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) ++| +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*) +| +--- androidx.fragment:fragment:1.2.4 -> 1.3.2 (*) +| +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 @@ -481,10 +481,10 @@ ++--- androidx.work:work-runtime:2.5.0 (*) ++--- androidx.work:work-runtime-ktx:2.5.0 +| +--- androidx.work:work-runtime:2.5.0 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.4.32 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.5.10 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*) ++--- com.etesync:journalmanager:1.1.1 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.4.32 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.5.10 (*) +| +--- com.madgag.spongycastle:core:1.54.0.0 +| +--- com.madgag.spongycastle:prov:1.54.0.0 +| | \--- com.madgag.spongycastle:core:1.54.0.0 @@ -507,123 +507,122 @@ +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| +--- androidx.interpolator:interpolator:1.0.0 (*) -+| +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) ++| +--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*) +| +--- 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-beta07 -+| +--- androidx.compose.animation:animation-core:1.0.0-beta07 +++--- androidx.compose.ui:ui:1.0.0-beta08 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta08 +| | +--- 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-beta07 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta08 +| | | +--- 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-beta07 -+| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta07 ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta08 ++| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta08 +| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | | +--- 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.compose.runtime:runtime:1.0.0-beta08 (*) ++| | | | +--- androidx.compose.ui:ui-util:1.0.0-beta08 ++| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) ++| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| | | +--- 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-beta07 -+| | +--- androidx.compose.runtime:runtime:1.0.0-beta07 (*) ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) ++| | | \--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) ++| +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta08 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) +| | +--- 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-beta07 (*) -+| +--- androidx.compose.ui:ui-graphics:1.0.0-beta07 ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) ++| +--- androidx.compose.ui:ui-geometry:1.0.0-beta08 (*) ++| +--- androidx.compose.ui:ui-graphics:1.0.0-beta08 +| | +--- androidx.annotation:annotation:1.2.0-beta01 -> 1.2.0 -+| | +--- 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-beta07 -+| | +--- androidx.compose.ui:ui-graphics:1.0.0-beta07 (*) -+| | +--- androidx.compose.ui:ui-unit:1.0.0-beta07 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta08 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10 ++| +--- androidx.compose.ui:ui-text:1.0.0-beta08 ++| | +--- androidx.compose.ui:ui-graphics:1.0.0-beta08 (*) ++| | +--- androidx.compose.ui:ui-unit:1.0.0-beta08 (*) +| | +--- 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-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 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) ++| | +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta08 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) +| | +--- 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-beta07 (*) ++| | \--- androidx.core:core:1.5.0-rc02 (*) ++| +--- androidx.compose.ui:ui-unit:1.0.0-beta08 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3 (*) -+| +--- 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.compose.runtime:runtime:1.0.0-beta08 (*) ++| +--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) +| +--- androidx.autofill:autofill:1.0.0 -+| | \--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) ++| | \--- androidx.core:core:1.1.0 -> 1.5.0-rc02 (*) +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3 (*) +| +--- 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-beta07 +++--- androidx.compose.foundation:foundation:1.0.0-beta08 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- androidx.compose.animation:animation:1.0.0-beta07 ++| +--- androidx.compose.animation:animation:1.0.0-beta08 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | +--- androidx.compose.animation:animation-core:1.0.0-beta07 (*) -+| | +--- androidx.compose.foundation:foundation-layout:1.0.0-beta07 ++| | +--- androidx.compose.animation:animation-core:1.0.0-beta08 (*) ++| | +--- androidx.compose.foundation:foundation-layout:1.0.0-beta08 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- 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-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-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-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-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-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-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.compose.ui:ui:1.0.0-beta08 (*) ++| | | +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) ++| | | +--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10 ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) ++| | +--- androidx.compose.ui:ui:1.0.0-beta08 (*) ++| | +--- androidx.compose.ui:ui-geometry:1.0.0-beta08 (*) ++| | +--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10 ++| +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) ++| +--- androidx.compose.ui:ui:1.0.0-beta08 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10 ++| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta08 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta08 (*) ++| \--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) +++--- androidx.compose.material:material:1.0.0-beta08 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta08 (*) ++| +--- androidx.compose.foundation:foundation:1.0.0-beta08 (*) ++| +--- androidx.compose.material:material-icons-core:1.0.0-beta08 ++| | +--- androidx.compose.ui:ui:1.0.0-beta08 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) ++| +--- androidx.compose.material:material-ripple:1.0.0-beta08 ++| | +--- androidx.compose.foundation:foundation:1.0.0-beta08 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10 ++| | +--- androidx.compose.animation:animation:1.0.0-beta08 (*) ++| | \--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) ++| +--- androidx.compose.ui:ui:1.0.0-beta08 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta08 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10 ++| +--- androidx.compose.animation:animation:1.0.0-beta08 (*) ++| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta08 (*) ++| \--- androidx.compose.ui:ui-util:1.0.0-beta08 (*) +++--- androidx.compose.runtime:runtime-livedata:1.0.0-beta08 ++| +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) -+| \--- androidx.compose.ui:ui:1.0.0-beta07 (*) -++--- com.google.android.material:compose-theme-adapter:1.0.0-beta07 ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) ++| \--- androidx.compose.ui:ui:1.0.0-beta08 (*) +++--- com.google.android.material:compose-theme-adapter:1.0.0-beta08 +| +--- 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-beta07 (*) -+| +--- androidx.compose.material:material:1.0.0-beta07 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta08 (*) ++| +--- androidx.compose.material:material:1.0.0-beta08 (*) +| +--- com.google.android.material:material:1.1.0 -> 1.3.0 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 (*) +\--- 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.compose.runtime:runtime:1.0.0-beta07 -> 1.0.0-beta08 (*) ++ +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta07 -> 1.0.0-beta08 (*) + +--- androidx.activity:activity-ktx:1.3.0-alpha08 (*) -+ +--- androidx.compose.ui:ui:1.0.0-beta07 (*) -+ \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) ++ +--- androidx.compose.ui:ui:1.0.0-beta07 -> 1.0.0-beta08 (*) ++ \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 -> 1.5.10 (*)