From a63a45df2260daf70f7071908d13b17fc6734fd0 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 8 Apr 2021 10:55:01 -0500 Subject: [PATCH] Android Studio Arctic Fox alpha 14 --- build.gradle.kts | 4 +- buildSrc/src/main/kotlin/Versions.kt | 2 +- deps_fdroid.txt | 124 ++++++++++----------- deps_googleplay.txt | 130 +++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 131 insertions(+), 131 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4274c166c..f95963f77 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:7.0.0-alpha13") + classpath("com.android.tools.build:gradle:7.0.0-alpha14") classpath("com.google.gms:google-services:4.3.5") classpath("com.google.firebase:firebase-crashlytics-gradle:2.5.2") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}") @@ -14,6 +14,6 @@ buildscript { } tasks.getByName("wrapper") { - gradleVersion = "6.8.2" + gradleVersion = "7.0-rc-1" distributionType = Wrapper.DistributionType.ALL } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 1054700f9..2ef7609dc 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.31" + const val kotlin = "1.4.32" const val targetSdk = 30 const val minSdk = 24 const val work = "2.5.0" diff --git a/deps_fdroid.txt b/deps_fdroid.txt index f9aa190ad..b0318c400 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -1,11 +1,11 @@ -++--- androidx.databinding:viewbinding:7.0.0-alpha13 +++--- androidx.databinding:viewbinding:7.0.0-alpha14 +| \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -++--- androidx.databinding:databinding-common:7.0.0-alpha13 -++--- androidx.databinding:databinding-runtime:7.0.0-alpha13 +++--- androidx.databinding:databinding-common:7.0.0-alpha14 +++--- androidx.databinding:databinding-runtime:7.0.0-alpha14 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- androidx.databinding:databinding-common:7.0.0-alpha13 -+| +--- androidx.databinding:viewbinding:7.0.0-alpha13 (*) ++| +--- androidx.databinding:databinding-common:7.0.0-alpha14 ++| +--- androidx.databinding:viewbinding:7.0.0-alpha14 (*) +| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.1 +| +--- androidx.arch.core:core-runtime:2.1.0 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 @@ -15,18 +15,18 @@ +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| +--- androidx.arch.core:core-common:2.1.0 (*) +| \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -++--- androidx.databinding:databinding-adapters:7.0.0-alpha13 -+| +--- androidx.databinding:databinding-runtime:7.0.0-alpha13 (*) -+| \--- androidx.databinding:databinding-common:7.0.0-alpha13 -++--- androidx.databinding:databinding-ktx:7.0.0-alpha13 +++--- androidx.databinding:databinding-adapters:7.0.0-alpha14 ++| +--- androidx.databinding:databinding-runtime:7.0.0-alpha14 (*) ++| \--- androidx.databinding:databinding-common:7.0.0-alpha14 +++--- androidx.databinding:databinding-ktx:7.0.0-alpha14 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 +| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.31 -+| | | | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 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.0 -> 1.4.31 -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.31 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.32 ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.32 (*) +| +--- 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 (*) @@ -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.31 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) +| | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| +--- androidx.databinding:databinding-runtime:7.0.0-alpha13 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31 -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| +--- androidx.databinding:databinding-runtime:7.0.0-alpha14 (*) ++| \--- 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 (*) ++--- com.gitlab.abaker:dav4jvm:deb2c9aef8 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.4.31 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.4.32 (*) +| \--- 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.4.31 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.32 (*) +| +--- 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.31 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.4.32 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| \--- androidx.core:core:1.3.2 -> 1.5.0-rc01 (*) ++--- com.gitlab.bitfireAT:cert4android:26a91a729f -+| +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-alpha13 -+| +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-alpha13 (*) -+| +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-alpha13 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.31 (*) ++| +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-alpha14 ++| +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-alpha14 (*) ++| +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-alpha14 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.32 (*) +| +--- 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 (*) @@ -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.31 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.32 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.4.1 (*) +| | +--- 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.31 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*) +| +--- 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.31 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*) +| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) +| +--- com.google.android.material:material:1.2.1 -> 1.3.0 +| | +--- androidx.annotation:annotation:1.0.1 -> 1.2.0 @@ -260,20 +260,20 @@ +| | +--- 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.31 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) +| +--- androidx.collection:collection-ktx:1.1.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.4.31 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.4.32 (*) +| | \--- 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.31 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*) ++--- androidx.lifecycle:lifecycle-runtime-ktx:2.3.0 -> 2.3.1 (*) ++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0 -> 2.3.1 (*) ++--- androidx.room:room-ktx:2.2.6 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.41 -> 1.4.31 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.41 -> 1.4.32 (*) +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 (*) +| +--- androidx.room:room-common:2.2.6 (*) +| \--- androidx.room:room-runtime:2.2.6 (*) @@ -292,15 +292,15 @@ ++--- io.noties.markwon:core:4.6.2 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| \--- com.atlassian.commonmark:commonmark:0.13.0 -++--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) +++--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) ++--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.4 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.4.31 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.4.31 ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.4.32 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.4.32 ++--- com.squareup.okhttp3:okhttp:4.8.1 +| +--- com.squareup.okio:okio:2.7.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.4.31 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.4.31 -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.4.31 (*) ++| | +--- 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 (*) ++--- com.google.code.gson:gson:2.8.6 ++--- com.google.android.material:material:1.3.0 (*) ++--- androidx.constraintlayout:constraintlayout:2.1.0-beta01 (*) @@ -348,10 +348,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.31 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.4.32 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) ++--- com.etesync:journalmanager:1.1.1 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.4.31 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.4.32 (*) +| +--- com.madgag.spongycastle:core:1.54.0.0 +| +--- com.madgag.spongycastle:prov:1.54.0.0 +| | \--- com.madgag.spongycastle:core:1.54.0.0 @@ -386,49 +386,49 @@ +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | | +--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.3 -> 0.3.4 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| | +--- androidx.compose.ui:ui-unit:1.0.0-beta03 +| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta03 +| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | | | +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| | | | +--- androidx.compose.ui:ui-util:1.0.0-beta03 -+| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) -+| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) ++| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| | | +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| | | \--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) +| | +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta03 +| | +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| +--- androidx.compose.ui:ui-geometry:1.0.0-beta03 (*) +| +--- androidx.compose.ui:ui-graphics:1.0.0-beta03 +| | +--- androidx.annotation:annotation:1.2.0-beta01 -> 1.2.0 +| | +--- androidx.compose.ui:ui-unit:1.0.0-beta03 (*) +| | +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| | +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32 +| +--- androidx.compose.ui:ui-text:1.0.0-beta03 +| | +--- androidx.compose.ui:ui-graphics:1.0.0-beta03 (*) +| | +--- androidx.compose.ui:ui-unit:1.0.0-beta03 (*) +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32 +| | +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| | +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta03 (*) +| | +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| | +--- androidx.collection:collection:1.1.0 (*) +| | \--- androidx.core:core:1.5.0-beta01 -> 1.5.0-rc01 (*) +| +--- androidx.compose.ui:ui-unit:1.0.0-beta03 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*) +| +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| +--- androidx.autofill:autofill:1.0.0 +| | \--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) @@ -445,15 +445,15 @@ +| | | +--- androidx.compose.ui:ui:1.0.0-beta03 (*) +| | | +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| | | +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32 +| | +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| | +--- androidx.compose.ui:ui:1.0.0-beta03 (*) +| | +--- androidx.compose.ui:ui-geometry:1.0.0-beta03 (*) +| | +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32 +| +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| +--- androidx.compose.ui:ui:1.0.0-beta03 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32 +| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta03 (*) +| +--- androidx.compose.ui:ui-text:1.0.0-beta03 (*) +| \--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) @@ -462,24 +462,24 @@ +| +--- androidx.compose.foundation:foundation:1.0.0-beta03 (*) +| +--- androidx.compose.material:material-icons-core:1.0.0-beta03 +| | +--- androidx.compose.ui:ui:1.0.0-beta03 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| +--- androidx.compose.material:material-ripple:1.0.0-beta03 +| | +--- androidx.compose.foundation:foundation:1.0.0-beta03 (*) +| | +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) -+| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32 +| | +--- androidx.compose.animation:animation:1.0.0-beta03 (*) +| | \--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) +| +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| +--- androidx.compose.ui:ui:1.0.0-beta03 (*) +| +--- androidx.compose.ui:ui-text:1.0.0-beta03 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32 +| +--- androidx.compose.animation:animation:1.0.0-beta03 (*) +| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta03 (*) +| \--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) ++--- androidx.compose.runtime:runtime-livedata:1.0.0-beta03 +| +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| \--- androidx.compose.ui:ui:1.0.0-beta03 (*) ++--- com.google.android.material:compose-theme-adapter:1.0.0-beta03 +| +--- androidx.appcompat:appcompat:1.3.0-beta01 -> 1.3.0-rc01 (*) @@ -487,10 +487,10 @@ +| +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| +--- androidx.compose.material:material:1.0.0-beta03 (*) +| +--- com.google.android.material:material:1.1.0 -> 1.3.0 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +\--- androidx.activity:activity-compose:1.3.0-alpha05 + +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) + +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta03 (*) + +--- androidx.activity:activity-ktx:1.3.0-alpha05 (*) + +--- androidx.compose.ui:ui:1.0.0-beta03 (*) -+ \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++ \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 010e03a66..b9a287164 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -1,11 +1,11 @@ -++--- androidx.databinding:viewbinding:7.0.0-alpha13 +++--- androidx.databinding:viewbinding:7.0.0-alpha14 +| \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -++--- androidx.databinding:databinding-common:7.0.0-alpha13 -++--- androidx.databinding:databinding-runtime:7.0.0-alpha13 +++--- androidx.databinding:databinding-common:7.0.0-alpha14 +++--- androidx.databinding:databinding-runtime:7.0.0-alpha14 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- androidx.databinding:databinding-common:7.0.0-alpha13 -+| +--- androidx.databinding:viewbinding:7.0.0-alpha13 (*) ++| +--- androidx.databinding:databinding-common:7.0.0-alpha14 ++| +--- androidx.databinding:viewbinding:7.0.0-alpha14 (*) +| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.1 +| +--- androidx.arch.core:core-runtime:2.1.0 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 @@ -15,18 +15,18 @@ +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| +--- androidx.arch.core:core-common:2.1.0 (*) +| \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -++--- androidx.databinding:databinding-adapters:7.0.0-alpha13 -+| +--- androidx.databinding:databinding-runtime:7.0.0-alpha13 (*) -+| \--- androidx.databinding:databinding-common:7.0.0-alpha13 -++--- androidx.databinding:databinding-ktx:7.0.0-alpha13 +++--- androidx.databinding:databinding-adapters:7.0.0-alpha14 ++| +--- androidx.databinding:databinding-runtime:7.0.0-alpha14 (*) ++| \--- androidx.databinding:databinding-common:7.0.0-alpha14 +++--- androidx.databinding:databinding-ktx:7.0.0-alpha14 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 +| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.31 -+| | | | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 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.0 -> 1.4.31 -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.31 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.32 ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.32 (*) +| +--- 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 (*) @@ -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.31 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) +| | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| +--- androidx.databinding:databinding-runtime:7.0.0-alpha13 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31 -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| +--- androidx.databinding:databinding-runtime:7.0.0-alpha14 (*) ++| \--- 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 (*) ++--- com.google.firebase:firebase-crashlytics:17.4.0 +| +--- com.google.android.datatransport:transport-api:2.2.1 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.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.31 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.4.32 (*) +| +--- 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,7 +204,7 @@ +| | \--- 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.31 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.4.32 (*) ++--- 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 (*) @@ -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.31 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.32 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.4.1 (*) ++--- com.gitlab.abaker:dav4jvm:deb2c9aef8 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.4.31 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.4.32 (*) +| \--- org.apache.commons:commons-lang3:3.8.1 ++--- com.gitlab.abaker:ical4android:0e928b567c +| +--- org.mnode.ical4j:ical4j:3.0.21 @@ -233,21 +233,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.4.31 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.32 (*) +| +--- 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.31 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.4.32 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| \--- androidx.core:core:1.3.2 -> 1.5.0-rc01 (*) ++--- com.gitlab.bitfireAT:cert4android:26a91a729f -+| +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-alpha13 -+| +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-alpha13 (*) -+| +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-alpha13 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.31 (*) ++| +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-alpha14 ++| +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-alpha14 (*) ++| +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-alpha14 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.32 (*) +| +--- 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 (*) @@ -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.31 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.32 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.4.1 (*) +| | +--- 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.31 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*) +| +--- 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.31 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*) +| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) +| +--- com.google.android.material:material:1.2.1 -> 1.3.0 +| | +--- androidx.annotation:annotation:1.0.1 -> 1.2.0 @@ -377,20 +377,20 @@ +| | +--- 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.31 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) +| +--- androidx.collection:collection-ktx:1.1.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.4.31 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.4.32 (*) +| | \--- 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.31 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*) ++--- androidx.lifecycle:lifecycle-runtime-ktx:2.3.0 -> 2.3.1 (*) ++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0 -> 2.3.1 (*) ++--- androidx.room:room-ktx:2.2.6 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.41 -> 1.4.31 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.41 -> 1.4.32 (*) +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 (*) +| +--- androidx.room:room-common:2.2.6 (*) +| \--- androidx.room:room-runtime:2.2.6 (*) @@ -409,15 +409,15 @@ ++--- io.noties.markwon:core:4.6.2 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| \--- com.atlassian.commonmark:commonmark:0.13.0 -++--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) +++--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*) ++--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.4 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.4.31 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.4.31 ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.4.32 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.4.32 ++--- com.squareup.okhttp3:okhttp:4.8.1 +| +--- com.squareup.okio:okio:2.7.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.4.31 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.4.31 -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.4.31 (*) ++| | +--- 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 (*) ++--- com.google.code.gson:gson:2.8.6 ++--- com.google.android.material:material:1.3.0 (*) ++--- androidx.constraintlayout:constraintlayout:2.1.0-beta01 (*) @@ -465,10 +465,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.31 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.4.32 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) ++--- com.etesync:journalmanager:1.1.1 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.4.31 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.4.32 (*) +| +--- com.madgag.spongycastle:core:1.54.0.0 +| +--- com.madgag.spongycastle:prov:1.54.0.0 +| | \--- com.madgag.spongycastle:core:1.54.0.0 @@ -503,49 +503,49 @@ +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | | +--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.3 -> 0.3.4 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| | +--- androidx.compose.ui:ui-unit:1.0.0-beta03 +| | | +--- androidx.compose.ui:ui-geometry:1.0.0-beta03 +| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | | | +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| | | | +--- androidx.compose.ui:ui-util:1.0.0-beta03 -+| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) -+| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) ++| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| | | +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| | | \--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) +| | +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta03 +| | +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| +--- androidx.compose.ui:ui-geometry:1.0.0-beta03 (*) +| +--- androidx.compose.ui:ui-graphics:1.0.0-beta03 +| | +--- androidx.annotation:annotation:1.2.0-beta01 -> 1.2.0 +| | +--- androidx.compose.ui:ui-unit:1.0.0-beta03 (*) +| | +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| | +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32 +| +--- androidx.compose.ui:ui-text:1.0.0-beta03 +| | +--- androidx.compose.ui:ui-graphics:1.0.0-beta03 (*) +| | +--- androidx.compose.ui:ui-unit:1.0.0-beta03 (*) +| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32 +| | +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| | +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta03 (*) +| | +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| | +--- androidx.collection:collection:1.1.0 (*) +| | \--- androidx.core:core:1.5.0-beta01 -> 1.5.0-rc01 (*) +| +--- androidx.compose.ui:ui-unit:1.0.0-beta03 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*) +| +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| +--- androidx.autofill:autofill:1.0.0 +| | \--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*) +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) @@ -562,15 +562,15 @@ +| | | +--- androidx.compose.ui:ui:1.0.0-beta03 (*) +| | | +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| | | +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32 +| | +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| | +--- androidx.compose.ui:ui:1.0.0-beta03 (*) +| | +--- androidx.compose.ui:ui-geometry:1.0.0-beta03 (*) +| | +--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32 +| +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| +--- androidx.compose.ui:ui:1.0.0-beta03 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32 +| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta03 (*) +| +--- androidx.compose.ui:ui-text:1.0.0-beta03 (*) +| \--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) @@ -579,24 +579,24 @@ +| +--- androidx.compose.foundation:foundation:1.0.0-beta03 (*) +| +--- androidx.compose.material:material-icons-core:1.0.0-beta03 +| | +--- androidx.compose.ui:ui:1.0.0-beta03 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| +--- androidx.compose.material:material-ripple:1.0.0-beta03 +| | +--- androidx.compose.foundation:foundation:1.0.0-beta03 (*) +| | +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) -+| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32 +| | +--- androidx.compose.animation:animation:1.0.0-beta03 (*) +| | \--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) +| +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| +--- androidx.compose.ui:ui:1.0.0-beta03 (*) +| +--- androidx.compose.ui:ui-text:1.0.0-beta03 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31 -> 1.4.32 +| +--- androidx.compose.animation:animation:1.0.0-beta03 (*) +| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta03 (*) +| \--- androidx.compose.ui:ui-util:1.0.0-beta03 (*) ++--- androidx.compose.runtime:runtime-livedata:1.0.0-beta03 +| +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +| \--- androidx.compose.ui:ui:1.0.0-beta03 (*) ++--- com.google.android.material:compose-theme-adapter:1.0.0-beta03 +| +--- androidx.appcompat:appcompat:1.3.0-beta01 -> 1.3.0-rc01 (*) @@ -604,10 +604,10 @@ +| +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) +| +--- androidx.compose.material:material:1.0.0-beta03 (*) +| +--- com.google.android.material:material:1.1.0 -> 1.3.0 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) +\--- androidx.activity:activity-compose:1.3.0-alpha05 + +--- androidx.compose.runtime:runtime:1.0.0-beta03 (*) + +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta03 (*) + +--- androidx.activity:activity-ktx:1.3.0-alpha05 (*) + +--- androidx.compose.ui:ui:1.0.0-beta03 (*) -+ \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++ \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.4.32 (*) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 25d326531..1d8981265 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists