diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a531e4823..2d1fe6cc7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -162,7 +162,7 @@ val genericImplementation by configurations val googleplayImplementation by configurations dependencies { - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2") implementation("com.github.tasks:dav4jvm:deb2c9aef8") implementation("com.github.tasks:ical4android:0e928b567c") { exclude(group = "com.sun.mail", module = "javax.mail") diff --git a/build.gradle.kts b/build.gradle.kts index 61a098276..39e9c8435 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:7.2.2") + classpath("com.android.tools.build:gradle:7.3.0-rc01") classpath("com.google.gms:google-services:4.3.13") classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.1") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}") diff --git a/deps_fdroid.txt b/deps_fdroid.txt index d0785133e..5fc3707c8 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -1,15 +1,15 @@ -++--- androidx.databinding:viewbinding:7.2.2 +++--- androidx.databinding:viewbinding:7.3.0-rc01 +| \--- androidx.annotation:annotation:1.0.0 -> 1.4.0 +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 +| \--- org.jetbrains:annotations:13.0 -> 20.1.0 -++--- androidx.databinding:databinding-common:7.2.2 -++--- androidx.databinding:databinding-runtime:7.2.2 +++--- androidx.databinding:databinding-common:7.3.0-rc01 +++--- androidx.databinding:databinding-runtime:7.3.0-rc01 +| +--- androidx.collection:collection:1.0.0 -> 1.2.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) -+| +--- androidx.databinding:databinding-common:7.2.2 -+| +--- androidx.databinding:viewbinding:7.2.2 (*) -+| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.5.0-rc01 ++| +--- androidx.databinding:databinding-common:7.3.0-rc01 ++| +--- androidx.databinding:viewbinding:7.3.0-rc01 (*) ++| \--- androidx.lifecycle:lifecycle-runtime:2.4.0 -> 2.5.0-rc01 +| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| +--- androidx.arch.core:core-common:2.1.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) @@ -19,10 +19,10 @@ +| \--- androidx.lifecycle:lifecycle-common:2.5.0-rc01 +| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| \--- androidx.lifecycle:lifecycle-common-java8:2.5.0-rc01 (c) -++--- androidx.databinding:databinding-adapters:7.2.2 -+| +--- androidx.databinding:databinding-runtime:7.2.2 (*) -+| \--- androidx.databinding:databinding-common:7.2.2 -++--- androidx.databinding:databinding-ktx:7.2.2 +++--- androidx.databinding:databinding-adapters:7.3.0-rc01 ++| +--- androidx.databinding:databinding-runtime:7.3.0-rc01 (*) ++| \--- androidx.databinding:databinding-common:7.3.0-rc01 +++--- androidx.databinding:databinding-ktx:7.3.0-rc01 +| +--- 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 @@ -37,32 +37,32 @@ +| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -> 1.7.10 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -> 1.7.10 (*) -+| +--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 -> 2.5.0-rc01 ++| +--- androidx.lifecycle:lifecycle-runtime-ktx:2.4.0 -> 2.5.0-rc01 +| | +--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | +--- androidx.lifecycle:lifecycle-runtime:2.5.0-rc01 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 -> 1.6.4 (*) -+| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 -> 2.4.1 ++| +--- androidx.lifecycle:lifecycle-livedata:2.4.0 -> 2.4.1 +| | +--- androidx.arch.core:core-common:2.1.0 (*) +| | +--- androidx.arch.core:core-runtime:2.1.0 (*) +| | \--- androidx.lifecycle:lifecycle-livedata-core:2.4.1 -> 2.5.0-rc01 +| | +--- androidx.arch.core:core-common:2.1.0 (*) +| | +--- androidx.arch.core:core-runtime:2.1.0 (*) +| | \--- androidx.lifecycle:lifecycle-common:2.5.0-rc01 (*) -+| +--- androidx.lifecycle:lifecycle-process:2.2.0 -> 2.4.1 ++| +--- androidx.lifecycle:lifecycle-process:2.4.0 -> 2.4.1 +| | +--- androidx.lifecycle:lifecycle-runtime:2.4.1 -> 2.5.0-rc01 (*) +| | +--- androidx.startup:startup-runtime:1.1.1 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | \--- androidx.tracing:tracing:1.0.0 +| | | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | \--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) -+| +--- androidx.lifecycle:lifecycle-service:2.2.0 -+| | \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.5.0-rc01 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 -> 2.5.0-rc01 ++| +--- androidx.lifecycle:lifecycle-service:2.4.0 ++| | \--- androidx.lifecycle:lifecycle-runtime:2.4.0 -> 2.5.0-rc01 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel:2.4.0 -> 2.5.0-rc01 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.0-rc01 (c) -+| +--- androidx.databinding:databinding-runtime:7.2.2 (*) ++| +--- androidx.databinding:databinding-runtime:7.3.0-rc01 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31 -> 1.7.10 (*) ++--- com.github.tasks:dav4jvm:deb2c9aef8 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.7.10 (*) @@ -96,10 +96,10 @@ +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| \--- androidx.core:core:1.9.0-alpha05 (c) ++--- com.github.bitfireAT:cert4android:7814052 -+| +--- androidx.databinding:databinding-common:7.2.0 -> 7.2.2 -+| +--- androidx.databinding:databinding-runtime:7.2.0 -> 7.2.2 (*) -+| +--- androidx.databinding:databinding-adapters:7.2.0 -> 7.2.2 (*) -+| +--- androidx.databinding:databinding-ktx:7.2.0 -> 7.2.2 (*) ++| +--- androidx.databinding:databinding-common:7.2.0 -> 7.3.0-rc01 ++| +--- androidx.databinding:databinding-runtime:7.2.0 -> 7.3.0-rc01 (*) ++| +--- androidx.databinding:databinding-adapters:7.2.0 -> 7.3.0-rc01 (*) ++| +--- androidx.databinding:databinding-ktx:7.2.0 -> 7.3.0-rc01 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -> 1.7.10 (*) +| +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.0-alpha05 +| | +--- androidx.activity:activity:1.6.0-alpha05 @@ -194,7 +194,7 @@ +| | +--- androidx.lifecycle:lifecycle-common:2.2.0 -> 2.5.0-rc01 (*) +| | +--- androidx.lifecycle:lifecycle-livedata:2.2.0 -> 2.4.1 (*) +| | +--- androidx.lifecycle:lifecycle-process:2.2.0 -> 2.4.1 (*) -+| | +--- androidx.lifecycle:lifecycle-service:2.2.0 (*) ++| | +--- androidx.lifecycle:lifecycle-service:2.2.0 -> 2.4.0 (*) +| | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 -> 2.5.0-rc01 (*) +| +--- androidx.lifecycle:lifecycle-livedata-ktx:2.4.1 +| | +--- androidx.lifecycle:lifecycle-livedata:2.4.1 (*) @@ -299,7 +299,7 @@ +| | +--- androidx.sqlite:sqlite:2.1.0 -> 2.2.0 (*) +| | +--- androidx.sqlite:sqlite-framework:2.1.0 -> 2.2.0 (*) +| | +--- androidx.core:core:1.1.0 -> 1.9.0-alpha05 (*) -+| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*) ++| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.4.0 (*) +| \--- com.google.dagger:hilt-android:2.35 -> 2.42 (*) ++--- androidx.fragment:fragment-ktx:1.4.0 +| +--- androidx.fragment:fragment:1.4.0 (*) @@ -577,7 +577,7 @@ ++--- androidx.compose.ui:ui-viewbinding:1.2.1 +| +--- androidx.compose.ui:ui:1.2.1 (*) +| +--- androidx.compose.ui:ui-util:1.2.1 (*) -+| +--- androidx.databinding:viewbinding:4.1.2 -> 7.2.2 (*) ++| +--- androidx.databinding:viewbinding:4.1.2 -> 7.3.0-rc01 (*) +| +--- androidx.fragment:fragment-ktx:1.3.2 -> 1.4.0 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) ++--- io.coil-kt:coil-compose:2.2.0 diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 7c5ea605e..e2a27641f 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -1,15 +1,15 @@ -++--- androidx.databinding:viewbinding:7.2.2 +++--- androidx.databinding:viewbinding:7.3.0-rc01 +| \--- androidx.annotation:annotation:1.0.0 -> 1.4.0 +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 +| \--- org.jetbrains:annotations:13.0 -> 20.1.0 -++--- androidx.databinding:databinding-common:7.2.2 -++--- androidx.databinding:databinding-runtime:7.2.2 +++--- androidx.databinding:databinding-common:7.3.0-rc01 +++--- androidx.databinding:databinding-runtime:7.3.0-rc01 +| +--- androidx.collection:collection:1.0.0 -> 1.2.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) -+| +--- androidx.databinding:databinding-common:7.2.2 -+| +--- androidx.databinding:viewbinding:7.2.2 (*) -+| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.5.0-rc01 ++| +--- androidx.databinding:databinding-common:7.3.0-rc01 ++| +--- androidx.databinding:viewbinding:7.3.0-rc01 (*) ++| \--- androidx.lifecycle:lifecycle-runtime:2.4.0 -> 2.5.0-rc01 +| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| +--- androidx.arch.core:core-common:2.1.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) @@ -19,10 +19,10 @@ +| \--- androidx.lifecycle:lifecycle-common:2.5.0-rc01 +| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| \--- androidx.lifecycle:lifecycle-common-java8:2.5.0-rc01 (c) -++--- androidx.databinding:databinding-adapters:7.2.2 -+| +--- androidx.databinding:databinding-runtime:7.2.2 (*) -+| \--- androidx.databinding:databinding-common:7.2.2 -++--- androidx.databinding:databinding-ktx:7.2.2 +++--- androidx.databinding:databinding-adapters:7.3.0-rc01 ++| +--- androidx.databinding:databinding-runtime:7.3.0-rc01 (*) ++| \--- androidx.databinding:databinding-common:7.3.0-rc01 +++--- androidx.databinding:databinding-ktx:7.3.0-rc01 +| +--- 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 @@ -37,32 +37,32 @@ +| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -> 1.7.10 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -> 1.7.10 (*) -+| +--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 -> 2.5.0-rc01 ++| +--- androidx.lifecycle:lifecycle-runtime-ktx:2.4.0 -> 2.5.0-rc01 +| | +--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | +--- androidx.lifecycle:lifecycle-runtime:2.5.0-rc01 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 -> 1.6.4 (*) -+| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 -> 2.4.1 ++| +--- androidx.lifecycle:lifecycle-livedata:2.4.0 -> 2.4.1 +| | +--- androidx.arch.core:core-common:2.1.0 (*) +| | +--- androidx.arch.core:core-runtime:2.1.0 (*) +| | \--- androidx.lifecycle:lifecycle-livedata-core:2.4.1 -> 2.5.0-rc01 +| | +--- androidx.arch.core:core-common:2.1.0 (*) +| | +--- androidx.arch.core:core-runtime:2.1.0 (*) +| | \--- androidx.lifecycle:lifecycle-common:2.5.0-rc01 (*) -+| +--- androidx.lifecycle:lifecycle-process:2.2.0 -> 2.4.1 ++| +--- androidx.lifecycle:lifecycle-process:2.4.0 -> 2.4.1 +| | +--- androidx.lifecycle:lifecycle-runtime:2.4.1 -> 2.5.0-rc01 (*) +| | +--- androidx.startup:startup-runtime:1.1.1 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | \--- androidx.tracing:tracing:1.0.0 +| | | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | \--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) -+| +--- androidx.lifecycle:lifecycle-service:2.2.0 -+| | \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.5.0-rc01 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 -> 2.5.0-rc01 ++| +--- androidx.lifecycle:lifecycle-service:2.4.0 ++| | \--- androidx.lifecycle:lifecycle-runtime:2.4.0 -> 2.5.0-rc01 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel:2.4.0 -> 2.5.0-rc01 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.0-rc01 (c) -+| +--- androidx.databinding:databinding-runtime:7.2.2 (*) ++| +--- androidx.databinding:databinding-runtime:7.3.0-rc01 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31 -> 1.7.10 (*) ++--- com.google.firebase:firebase-crashlytics:18.2.11 +| +--- com.google.android.datatransport:transport-api:3.0.0 @@ -323,10 +323,10 @@ +| | \--- org.slf4j:slf4j-api:1.7.30 +| \--- androidx.core:core-ktx:1.3.2 -> 1.9.0-alpha05 (*) ++--- com.github.bitfireAT:cert4android:7814052 -+| +--- androidx.databinding:databinding-common:7.2.0 -> 7.2.2 -+| +--- androidx.databinding:databinding-runtime:7.2.0 -> 7.2.2 (*) -+| +--- androidx.databinding:databinding-adapters:7.2.0 -> 7.2.2 (*) -+| +--- androidx.databinding:databinding-ktx:7.2.0 -> 7.2.2 (*) ++| +--- androidx.databinding:databinding-common:7.2.0 -> 7.3.0-rc01 ++| +--- androidx.databinding:databinding-runtime:7.2.0 -> 7.3.0-rc01 (*) ++| +--- androidx.databinding:databinding-adapters:7.2.0 -> 7.3.0-rc01 (*) ++| +--- androidx.databinding:databinding-ktx:7.2.0 -> 7.3.0-rc01 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -> 1.7.10 (*) +| +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.0-alpha05 (*) +| +--- androidx.cardview:cardview:1.0.0 @@ -339,7 +339,7 @@ +| | +--- androidx.lifecycle:lifecycle-common:2.2.0 -> 2.5.0-rc01 (*) +| | +--- androidx.lifecycle:lifecycle-livedata:2.2.0 -> 2.4.1 (*) +| | +--- androidx.lifecycle:lifecycle-process:2.2.0 -> 2.4.1 (*) -+| | +--- androidx.lifecycle:lifecycle-service:2.2.0 (*) ++| | +--- androidx.lifecycle:lifecycle-service:2.2.0 -> 2.4.0 (*) +| | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 -> 2.5.0-rc01 (*) +| +--- androidx.lifecycle:lifecycle-livedata-ktx:2.4.1 +| | +--- androidx.lifecycle:lifecycle-livedata:2.4.1 (*) @@ -435,7 +435,7 @@ +| | +--- androidx.sqlite:sqlite:2.1.0 -> 2.2.0 (*) +| | +--- androidx.sqlite:sqlite-framework:2.1.0 -> 2.2.0 (*) +| | +--- androidx.core:core:1.1.0 -> 1.9.0-alpha05 (*) -+| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*) ++| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.4.0 (*) +| \--- com.google.dagger:hilt-android:2.35 -> 2.42 (*) ++--- androidx.fragment:fragment-ktx:1.4.0 +| +--- androidx.fragment:fragment:1.4.0 (*) @@ -713,7 +713,7 @@ ++--- androidx.compose.ui:ui-viewbinding:1.2.1 +| +--- androidx.compose.ui:ui:1.2.1 (*) +| +--- androidx.compose.ui:ui-util:1.2.1 (*) -+| +--- androidx.databinding:viewbinding:4.1.2 -> 7.2.2 (*) ++| +--- androidx.databinding:viewbinding:4.1.2 -> 7.3.0-rc01 (*) +| +--- androidx.fragment:fragment-ktx:1.3.2 -> 1.4.0 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) ++--- io.coil-kt:coil-compose:2.2.0