diff --git a/build.gradle.kts b/build.gradle.kts index d6a445184..dcb85b3e8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-rc01") + classpath("com.android.tools.build:gradle:7.4.0-rc02") classpath("com.google.gms:google-services:4.3.14") classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.2") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}") diff --git a/deps_fdroid.txt b/deps_fdroid.txt index e2099d9b5..1d35410db 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -1,14 +1,14 @@ -++--- androidx.databinding:viewbinding:7.4.0-rc01 +++--- androidx.databinding:viewbinding:7.4.0-rc02 +| \--- androidx.annotation:annotation:1.0.0 -> 1.5.0 +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.7.20 +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.7.20 +| \--- org.jetbrains:annotations:13.0 -> 20.1.0 -++--- androidx.databinding:databinding-common:7.4.0-rc01 -++--- androidx.databinding:databinding-runtime:7.4.0-rc01 +++--- androidx.databinding:databinding-common:7.4.0-rc02 +++--- androidx.databinding:databinding-runtime:7.4.0-rc02 +| +--- androidx.collection:collection:1.0.0 -> 1.2.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) -+| +--- androidx.databinding:databinding-common:7.4.0-rc01 -+| +--- androidx.databinding:viewbinding:7.4.0-rc01 (*) ++| +--- androidx.databinding:databinding-common:7.4.0-rc02 ++| +--- androidx.databinding:viewbinding:7.4.0-rc02 (*) +| \--- androidx.lifecycle:lifecycle-runtime:2.4.0 -> 2.5.1 +| +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) +| +--- androidx.arch.core:core-common:2.1.0 @@ -19,10 +19,10 @@ +| \--- androidx.lifecycle:lifecycle-common:2.5.1 +| +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) +| \--- androidx.lifecycle:lifecycle-common-java8:2.5.1 (c) -++--- androidx.databinding:databinding-adapters:7.4.0-rc01 -+| +--- androidx.databinding:databinding-runtime:7.4.0-rc01 (*) -+| \--- androidx.databinding:databinding-common:7.4.0-rc01 -++--- androidx.databinding:databinding-ktx:7.4.0-rc01 +++--- androidx.databinding:databinding-adapters:7.4.0-rc02 ++| +--- androidx.databinding:databinding-runtime:7.4.0-rc02 (*) ++| \--- androidx.databinding:databinding-common:7.4.0-rc02 +++--- androidx.databinding:databinding-ktx:7.4.0-rc02 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.6.4 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 +| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 @@ -62,7 +62,7 @@ +| | +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.20 (*) +| | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1 (c) -+| +--- androidx.databinding:databinding-runtime:7.4.0-rc01 (*) ++| +--- androidx.databinding:databinding-runtime:7.4.0-rc02 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 -> 1.7.20 (*) ++--- com.github.bitfireAT:dav4jvm:2.2 +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20 (*) @@ -118,10 +118,10 @@ +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.7.20 (*) +| \--- androidx.core:core:1.9.0 (c) ++--- com.github.bitfireAT:cert4android:7814052 -+| +--- androidx.databinding:databinding-common:7.2.0 -> 7.4.0-rc01 -+| +--- androidx.databinding:databinding-runtime:7.2.0 -> 7.4.0-rc01 (*) -+| +--- androidx.databinding:databinding-adapters:7.2.0 -> 7.4.0-rc01 (*) -+| +--- androidx.databinding:databinding-ktx:7.2.0 -> 7.4.0-rc01 (*) ++| +--- androidx.databinding:databinding-common:7.2.0 -> 7.4.0-rc02 ++| +--- androidx.databinding:databinding-runtime:7.2.0 -> 7.4.0-rc02 (*) ++| +--- androidx.databinding:databinding-adapters:7.2.0 -> 7.4.0-rc02 (*) ++| +--- androidx.databinding:databinding-ktx:7.2.0 -> 7.4.0-rc02 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -> 1.7.20 (*) +| +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.0-rc01 +| | +--- androidx.activity:activity:1.6.0-rc02 -> 1.6.1 @@ -629,7 +629,7 @@ ++--- androidx.compose.ui:ui-viewbinding:1.3.1 +| +--- androidx.compose.ui:ui:1.3.1 (*) +| +--- androidx.compose.ui:ui-util:1.3.1 (*) -+| +--- androidx.databinding:viewbinding:4.1.2 -> 7.4.0-rc01 (*) ++| +--- androidx.databinding:viewbinding:4.1.2 -> 7.4.0-rc02 (*) +| +--- androidx.fragment:fragment-ktx:1.3.2 -> 1.5.4 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.7.20 (*) ++--- io.coil-kt:coil-compose:2.2.0 diff --git a/deps_googleplay.txt b/deps_googleplay.txt index e6cb9e2f0..740969687 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -1,14 +1,14 @@ -++--- androidx.databinding:viewbinding:7.4.0-rc01 +++--- androidx.databinding:viewbinding:7.4.0-rc02 +| \--- androidx.annotation:annotation:1.0.0 -> 1.5.0 +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.7.20 +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.7.20 +| \--- org.jetbrains:annotations:13.0 -> 20.1.0 -++--- androidx.databinding:databinding-common:7.4.0-rc01 -++--- androidx.databinding:databinding-runtime:7.4.0-rc01 +++--- androidx.databinding:databinding-common:7.4.0-rc02 +++--- androidx.databinding:databinding-runtime:7.4.0-rc02 +| +--- androidx.collection:collection:1.0.0 -> 1.2.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) -+| +--- androidx.databinding:databinding-common:7.4.0-rc01 -+| +--- androidx.databinding:viewbinding:7.4.0-rc01 (*) ++| +--- androidx.databinding:databinding-common:7.4.0-rc02 ++| +--- androidx.databinding:viewbinding:7.4.0-rc02 (*) +| \--- androidx.lifecycle:lifecycle-runtime:2.4.0 -> 2.5.1 +| +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) +| +--- androidx.arch.core:core-common:2.1.0 @@ -19,10 +19,10 @@ +| \--- androidx.lifecycle:lifecycle-common:2.5.1 +| +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) +| \--- androidx.lifecycle:lifecycle-common-java8:2.5.1 (c) -++--- androidx.databinding:databinding-adapters:7.4.0-rc01 -+| +--- androidx.databinding:databinding-runtime:7.4.0-rc01 (*) -+| \--- androidx.databinding:databinding-common:7.4.0-rc01 -++--- androidx.databinding:databinding-ktx:7.4.0-rc01 +++--- androidx.databinding:databinding-adapters:7.4.0-rc02 ++| +--- androidx.databinding:databinding-runtime:7.4.0-rc02 (*) ++| \--- androidx.databinding:databinding-common:7.4.0-rc02 +++--- androidx.databinding:databinding-ktx:7.4.0-rc02 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.6.4 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 +| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 @@ -62,7 +62,7 @@ +| | +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.20 (*) +| | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1 (c) -+| +--- androidx.databinding:databinding-runtime:7.4.0-rc01 (*) ++| +--- androidx.databinding:databinding-runtime:7.4.0-rc02 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 -> 1.7.20 (*) ++--- com.google.firebase:firebase-crashlytics:18.2.11 +| +--- com.google.android.datatransport:transport-api:3.0.0 @@ -349,10 +349,10 @@ +| | \--- org.slf4j:slf4j-api:2.0.3 +| \--- androidx.core:core-ktx:1.9.0 (*) ++--- com.github.bitfireAT:cert4android:7814052 -+| +--- androidx.databinding:databinding-common:7.2.0 -> 7.4.0-rc01 -+| +--- androidx.databinding:databinding-runtime:7.2.0 -> 7.4.0-rc01 (*) -+| +--- androidx.databinding:databinding-adapters:7.2.0 -> 7.4.0-rc01 (*) -+| +--- androidx.databinding:databinding-ktx:7.2.0 -> 7.4.0-rc01 (*) ++| +--- androidx.databinding:databinding-common:7.2.0 -> 7.4.0-rc02 ++| +--- androidx.databinding:databinding-runtime:7.2.0 -> 7.4.0-rc02 (*) ++| +--- androidx.databinding:databinding-adapters:7.2.0 -> 7.4.0-rc02 (*) ++| +--- androidx.databinding:databinding-ktx:7.2.0 -> 7.4.0-rc02 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -> 1.7.20 (*) +| +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.0-rc01 (*) +| +--- androidx.cardview:cardview:1.0.0 @@ -765,7 +765,7 @@ ++--- androidx.compose.ui:ui-viewbinding:1.3.1 +| +--- androidx.compose.ui:ui:1.3.1 (*) +| +--- androidx.compose.ui:ui-util:1.3.1 (*) -+| +--- androidx.databinding:viewbinding:4.1.2 -> 7.4.0-rc01 (*) ++| +--- androidx.databinding:viewbinding:4.1.2 -> 7.4.0-rc02 (*) +| +--- androidx.fragment:fragment-ktx:1.3.2 -> 1.5.4 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.7.20 (*) ++--- io.coil-kt:coil-compose:2.2.0