diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 0a826ae8a..4d2334695 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -228,42 +228,42 @@ +| \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (*) ++--- project :data +| +--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (*) -+| +--- androidx.room:room-runtime:2.7.0-rc01 -+| | \--- androidx.room:room-runtime-android:2.7.0-rc01 ++| +--- androidx.room:room-runtime:2.7.0-rc02 ++| | \--- androidx.room:room-runtime-android:2.7.0-rc02 +| | +--- androidx.annotation:annotation:1.8.1 -> 1.9.1 (*) +| | +--- androidx.annotation:annotation-experimental:1.4.1 +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 2.1.10 (*) +| | +--- androidx.arch.core:core-runtime:2.2.0 (*) +| | +--- androidx.collection:collection:1.4.2 -> 1.4.4 (*) -+| | +--- androidx.room:room-common:2.7.0-rc01 -+| | | \--- androidx.room:room-common-jvm:2.7.0-rc01 ++| | +--- androidx.room:room-common:2.7.0-rc02 ++| | | \--- androidx.room:room-common-jvm:2.7.0-rc02 +| | | +--- androidx.annotation:annotation:1.9.1 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.10 (*) -+| | | +--- androidx.room:room-ktx:2.7.0-rc01 (c) -+| | | +--- androidx.room:room-runtime:2.7.0-rc01 (c) ++| | | +--- androidx.room:room-ktx:2.7.0-rc02 (c) ++| | | +--- androidx.room:room-runtime:2.7.0-rc02 (c) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (c) -+| | +--- androidx.sqlite:sqlite:2.5.0-rc01 -+| | | \--- androidx.sqlite:sqlite-android:2.5.0-rc01 ++| | +--- androidx.sqlite:sqlite:2.5.0-rc02 ++| | | \--- androidx.sqlite:sqlite-android:2.5.0-rc02 +| | | +--- androidx.annotation:annotation:1.8.1 -> 1.9.1 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.10 (*) -+| | | +--- androidx.sqlite:sqlite-framework:2.5.0-rc01 (c) -+| | | +--- androidx.sqlite:sqlite-bundled:2.5.0-rc01 (c) ++| | | +--- androidx.sqlite:sqlite-framework:2.5.0-rc02 (c) ++| | | +--- androidx.sqlite:sqlite-bundled:2.5.0-rc02 (c) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (c) -+| | +--- androidx.sqlite:sqlite-framework:2.5.0-rc01 -+| | | \--- androidx.sqlite:sqlite-framework-android:2.5.0-rc01 ++| | +--- androidx.sqlite:sqlite-framework:2.5.0-rc02 ++| | | \--- androidx.sqlite:sqlite-framework-android:2.5.0-rc02 +| | | +--- androidx.annotation:annotation:1.8.1 -> 1.9.1 (*) -+| | | +--- androidx.sqlite:sqlite:2.5.0-rc01 (*) ++| | | +--- androidx.sqlite:sqlite:2.5.0-rc02 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.10 (*) -+| | | +--- androidx.sqlite:sqlite:2.5.0-rc01 (c) -+| | | +--- androidx.sqlite:sqlite-bundled:2.5.0-rc01 (c) ++| | | +--- androidx.sqlite:sqlite:2.5.0-rc02 (c) ++| | | +--- androidx.sqlite:sqlite-bundled:2.5.0-rc02 (c) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (c) +| | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.10 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 -> 1.10.1 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 -> 1.10.1 (*) +| | +--- org.jspecify:jspecify:1.0.0 -+| | +--- androidx.room:room-common:2.7.0-rc01 (c) ++| | +--- androidx.room:room-common:2.7.0-rc02 (c) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (c) -+| | \--- androidx.room:room-ktx:2.7.0-rc01 (c) ++| | \--- androidx.room:room-ktx:2.7.0-rc02 (c) +| +--- org.jetbrains.kotlinx:kotlinx-datetime:0.6.2 +| | \--- org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.2 +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.21 -> 2.1.10 (*) @@ -1224,13 +1224,13 @@ +| | +--- androidx.core:core:1.12.0 -> 1.13.1 (*) +| | +--- androidx.lifecycle:lifecycle-livedata:2.6.2 -> 2.8.7 (*) +| | +--- androidx.lifecycle:lifecycle-service:2.6.2 -> 2.8.7 (*) -+| | +--- androidx.room:room-ktx:2.6.1 -> 2.7.0-rc01 -+| | | +--- androidx.room:room-common:2.7.0-rc01 (*) -+| | | +--- androidx.room:room-runtime:2.7.0-rc01 (*) ++| | +--- androidx.room:room-ktx:2.6.1 -> 2.7.0-rc02 ++| | | +--- androidx.room:room-common:2.7.0-rc02 (*) ++| | | +--- androidx.room:room-runtime:2.7.0-rc02 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.10 (*) +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 -> 1.10.1 (*) -+| | | +--- androidx.room:room-common:2.7.0-rc01 (c) -+| | | +--- androidx.room:room-runtime:2.7.0-rc01 (c) ++| | | +--- androidx.room:room-common:2.7.0-rc02 (c) ++| | | +--- androidx.room:room-runtime:2.7.0-rc02 (c) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (c) +| | +--- androidx.startup:startup-runtime:1.1.1 (*) +| | +--- androidx.tracing:tracing-ktx:1.2.0 @@ -1265,13 +1265,13 @@ ++--- androidx.lifecycle:lifecycle-runtime:2.8.7 (*) ++--- androidx.lifecycle:lifecycle-runtime-compose:2.8.7 (*) ++--- androidx.lifecycle:lifecycle-viewmodel:2.8.7 (*) -++--- androidx.room:room-runtime:2.7.0-rc01 (*) -++--- androidx.sqlite:sqlite-bundled:2.5.0-rc01 -+| \--- androidx.sqlite:sqlite-bundled-android:2.5.0-rc01 -+| +--- androidx.sqlite:sqlite:2.5.0-rc01 (*) +++--- androidx.room:room-runtime:2.7.0-rc02 (*) +++--- androidx.sqlite:sqlite-bundled:2.5.0-rc01 -> 2.5.0-rc02 ++| \--- androidx.sqlite:sqlite-bundled-android:2.5.0-rc02 ++| +--- androidx.sqlite:sqlite:2.5.0-rc02 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.10 (*) -+| +--- androidx.sqlite:sqlite:2.5.0-rc01 (c) -+| +--- androidx.sqlite:sqlite-framework:2.5.0-rc01 (c) ++| +--- androidx.sqlite:sqlite:2.5.0-rc02 (c) ++| +--- androidx.sqlite:sqlite-framework:2.5.0-rc02 (c) +| \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (c) ++--- androidx.appcompat:appcompat:1.7.0 (*) ++--- com.mikepenz:iconics-core:5.5.0-b01 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 7b7e65f7a..0138e6d76 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -799,41 +799,41 @@ ++--- org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.10 (*) ++--- project :data +| +--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (*) -+| +--- androidx.room:room-runtime:2.7.0-rc01 -+| | \--- androidx.room:room-runtime-android:2.7.0-rc01 ++| +--- androidx.room:room-runtime:2.7.0-rc02 ++| | \--- androidx.room:room-runtime-android:2.7.0-rc02 +| | +--- androidx.annotation:annotation:1.8.1 -> 1.9.1 (*) +| | +--- androidx.annotation:annotation-experimental:1.4.1 (*) +| | +--- androidx.arch.core:core-runtime:2.2.0 (*) +| | +--- androidx.collection:collection:1.4.2 -> 1.4.4 (*) -+| | +--- androidx.room:room-common:2.7.0-rc01 -+| | | \--- androidx.room:room-common-jvm:2.7.0-rc01 ++| | +--- androidx.room:room-common:2.7.0-rc02 ++| | | \--- androidx.room:room-common-jvm:2.7.0-rc02 +| | | +--- androidx.annotation:annotation:1.9.1 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.10 (*) -+| | | +--- androidx.room:room-ktx:2.7.0-rc01 (c) -+| | | +--- androidx.room:room-runtime:2.7.0-rc01 (c) ++| | | +--- androidx.room:room-ktx:2.7.0-rc02 (c) ++| | | +--- androidx.room:room-runtime:2.7.0-rc02 (c) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (c) -+| | +--- androidx.sqlite:sqlite:2.5.0-rc01 -+| | | \--- androidx.sqlite:sqlite-android:2.5.0-rc01 ++| | +--- androidx.sqlite:sqlite:2.5.0-rc02 ++| | | \--- androidx.sqlite:sqlite-android:2.5.0-rc02 +| | | +--- androidx.annotation:annotation:1.8.1 -> 1.9.1 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.10 (*) -+| | | +--- androidx.sqlite:sqlite-framework:2.5.0-rc01 (c) -+| | | +--- androidx.sqlite:sqlite-bundled:2.5.0-rc01 (c) ++| | | +--- androidx.sqlite:sqlite-framework:2.5.0-rc02 (c) ++| | | +--- androidx.sqlite:sqlite-bundled:2.5.0-rc02 (c) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (c) -+| | +--- androidx.sqlite:sqlite-framework:2.5.0-rc01 -+| | | \--- androidx.sqlite:sqlite-framework-android:2.5.0-rc01 ++| | +--- androidx.sqlite:sqlite-framework:2.5.0-rc02 ++| | | \--- androidx.sqlite:sqlite-framework-android:2.5.0-rc02 +| | | +--- androidx.annotation:annotation:1.8.1 -> 1.9.1 (*) -+| | | +--- androidx.sqlite:sqlite:2.5.0-rc01 (*) ++| | | +--- androidx.sqlite:sqlite:2.5.0-rc02 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.10 (*) -+| | | +--- androidx.sqlite:sqlite:2.5.0-rc01 (c) -+| | | +--- androidx.sqlite:sqlite-bundled:2.5.0-rc01 (c) ++| | | +--- androidx.sqlite:sqlite:2.5.0-rc02 (c) ++| | | +--- androidx.sqlite:sqlite-bundled:2.5.0-rc02 (c) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (c) +| | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.10 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 -> 1.10.1 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 -> 1.10.1 (*) +| | +--- org.jspecify:jspecify:1.0.0 -+| | +--- androidx.room:room-common:2.7.0-rc01 (c) ++| | +--- androidx.room:room-common:2.7.0-rc02 (c) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (c) -+| | \--- androidx.room:room-ktx:2.7.0-rc01 (c) ++| | \--- androidx.room:room-ktx:2.7.0-rc02 (c) +| +--- org.jetbrains.kotlinx:kotlinx-datetime:0.6.2 +| | \--- org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.2 +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.21 -> 2.1.10 (*) @@ -1579,13 +1579,13 @@ +| | +--- androidx.core:core:1.12.0 -> 1.13.1 (*) +| | +--- androidx.lifecycle:lifecycle-livedata:2.6.2 -> 2.8.7 (*) +| | +--- androidx.lifecycle:lifecycle-service:2.6.2 -> 2.8.7 (*) -+| | +--- androidx.room:room-ktx:2.6.1 -> 2.7.0-rc01 -+| | | +--- androidx.room:room-common:2.7.0-rc01 (*) -+| | | +--- androidx.room:room-runtime:2.7.0-rc01 (*) ++| | +--- androidx.room:room-ktx:2.6.1 -> 2.7.0-rc02 ++| | | +--- androidx.room:room-common:2.7.0-rc02 (*) ++| | | +--- androidx.room:room-runtime:2.7.0-rc02 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.10 (*) +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 -> 1.10.1 (*) -+| | | +--- androidx.room:room-common:2.7.0-rc01 (c) -+| | | +--- androidx.room:room-runtime:2.7.0-rc01 (c) ++| | | +--- androidx.room:room-common:2.7.0-rc02 (c) ++| | | +--- androidx.room:room-runtime:2.7.0-rc02 (c) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (c) +| | +--- androidx.startup:startup-runtime:1.1.1 (*) +| | +--- androidx.tracing:tracing-ktx:1.2.0 @@ -1620,13 +1620,13 @@ ++--- androidx.lifecycle:lifecycle-runtime:2.8.7 (*) ++--- androidx.lifecycle:lifecycle-runtime-compose:2.8.7 (*) ++--- androidx.lifecycle:lifecycle-viewmodel:2.8.7 (*) -++--- androidx.room:room-runtime:2.7.0-rc01 (*) -++--- androidx.sqlite:sqlite-bundled:2.5.0-rc01 -+| \--- androidx.sqlite:sqlite-bundled-android:2.5.0-rc01 -+| +--- androidx.sqlite:sqlite:2.5.0-rc01 (*) +++--- androidx.room:room-runtime:2.7.0-rc02 (*) +++--- androidx.sqlite:sqlite-bundled:2.5.0-rc01 -> 2.5.0-rc02 ++| \--- androidx.sqlite:sqlite-bundled-android:2.5.0-rc02 ++| +--- androidx.sqlite:sqlite:2.5.0-rc02 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.10 (*) -+| +--- androidx.sqlite:sqlite:2.5.0-rc01 (c) -+| +--- androidx.sqlite:sqlite-framework:2.5.0-rc01 (c) ++| +--- androidx.sqlite:sqlite:2.5.0-rc02 (c) ++| +--- androidx.sqlite:sqlite-framework:2.5.0-rc02 (c) +| \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (c) ++--- androidx.appcompat:appcompat:1.7.0 (*) ++--- com.mikepenz:iconics-core:5.5.0-b01 (*) diff --git a/deps_wear.txt b/deps_wear.txt index 4afce32fa..1a3374570 100644 --- a/deps_wear.txt +++ b/deps_wear.txt @@ -839,36 +839,36 @@ +| +--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (*) +| +--- project :data +| | +--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (*) -+| | +--- androidx.room:room-runtime:2.7.0-rc01 -+| | | \--- androidx.room:room-runtime-android:2.7.0-rc01 ++| | +--- androidx.room:room-runtime:2.7.0-rc02 ++| | | \--- androidx.room:room-runtime-android:2.7.0-rc02 +| | | +--- androidx.annotation:annotation:1.8.1 -> 1.9.1 (*) +| | | +--- androidx.annotation:annotation-experimental:1.4.1 (*) +| | | +--- androidx.arch.core:core-runtime:2.2.0 (*) +| | | +--- androidx.collection:collection:1.4.2 -> 1.4.4 (*) -+| | | +--- androidx.room:room-common:2.7.0-rc01 -+| | | | \--- androidx.room:room-common-jvm:2.7.0-rc01 ++| | | +--- androidx.room:room-common:2.7.0-rc02 ++| | | | \--- androidx.room:room-common-jvm:2.7.0-rc02 +| | | | +--- androidx.annotation:annotation:1.9.1 (*) +| | | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.10 (*) -+| | | | +--- androidx.room:room-runtime:2.7.0-rc01 (c) ++| | | | +--- androidx.room:room-runtime:2.7.0-rc02 (c) +| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (c) -+| | | +--- androidx.sqlite:sqlite:2.5.0-rc01 -+| | | | \--- androidx.sqlite:sqlite-android:2.5.0-rc01 ++| | | +--- androidx.sqlite:sqlite:2.5.0-rc02 ++| | | | \--- androidx.sqlite:sqlite-android:2.5.0-rc02 +| | | | +--- androidx.annotation:annotation:1.8.1 -> 1.9.1 (*) +| | | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.10 (*) -+| | | | +--- androidx.sqlite:sqlite-framework:2.5.0-rc01 (c) ++| | | | +--- androidx.sqlite:sqlite-framework:2.5.0-rc02 (c) +| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (c) -+| | | +--- androidx.sqlite:sqlite-framework:2.5.0-rc01 -+| | | | \--- androidx.sqlite:sqlite-framework-android:2.5.0-rc01 ++| | | +--- androidx.sqlite:sqlite-framework:2.5.0-rc02 ++| | | | \--- androidx.sqlite:sqlite-framework-android:2.5.0-rc02 +| | | | +--- androidx.annotation:annotation:1.8.1 -> 1.9.1 (*) -+| | | | +--- androidx.sqlite:sqlite:2.5.0-rc01 (*) ++| | | | +--- androidx.sqlite:sqlite:2.5.0-rc02 (*) +| | | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.10 (*) -+| | | | +--- androidx.sqlite:sqlite:2.5.0-rc01 (c) ++| | | | +--- androidx.sqlite:sqlite:2.5.0-rc02 (c) +| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (c) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.10 (*) +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 -> 1.8.1 (*) +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 -> 1.8.1 (*) +| | | +--- org.jspecify:jspecify:1.0.0 -+| | | +--- androidx.room:room-common:2.7.0-rc01 (c) ++| | | +--- androidx.room:room-common:2.7.0-rc02 (c) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (c) +| | +--- org.jetbrains.kotlinx:kotlinx-datetime:0.6.2 +| | | \--- org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.2 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 73ef766a3..ed5751672 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -55,7 +55,7 @@ preference = "1.2.1" protobuf = "4.30.0" recyclerview = "1.4.0" rfc5545-datetime = "0.2.4" -room = "2.7.0-rc01" +room = "2.7.0-rc02" shortcut-badger = "1.1.22" timber = "5.0.1" swiperefreshlayout = "1.1.0"