diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 534612813..52a1c69db 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -226,37 +226,38 @@ +| \--- org.jetbrains.kotlin:kotlin-stdlib:2.0.0 (*) ++--- project :data +| +--- org.jetbrains.kotlin:kotlin-stdlib:2.0.0 (*) -+| +--- androidx.room:room-runtime:2.7.0-alpha04 -+| | \--- androidx.room:room-runtime-android:2.7.0-alpha04 ++| +--- androidx.room:room-runtime:2.7.0-alpha05 ++| | \--- androidx.room:room-runtime-android:2.7.0-alpha05 +| | +--- androidx.annotation:annotation:1.8.0 (*) +| | +--- androidx.annotation:annotation-experimental:1.4.1 +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 2.0.0 (*) +| | +--- androidx.arch.core:core-runtime:2.2.0 (*) -+| | +--- androidx.room:room-common:2.7.0-alpha04 -+| | | \--- androidx.room:room-common-jvm:2.7.0-alpha04 ++| | +--- androidx.collection:collection:1.4.0 (*) ++| | +--- androidx.room:room-common:2.7.0-alpha05 ++| | | \--- androidx.room:room-common-jvm:2.7.0-alpha05 +| | | +--- androidx.annotation:annotation:1.8.0 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*) -+| | | \--- androidx.room:room-runtime:2.7.0-alpha04 (c) -+| | +--- androidx.sqlite:sqlite:2.5.0-alpha04 -+| | | \--- androidx.sqlite:sqlite-android:2.5.0-alpha04 ++| | | \--- androidx.room:room-runtime:2.7.0-alpha05 (c) ++| | +--- androidx.sqlite:sqlite:2.5.0-alpha05 ++| | | \--- androidx.sqlite:sqlite-android:2.5.0-alpha05 +| | | +--- androidx.annotation:annotation:1.8.0 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*) -+| | | +--- androidx.sqlite:sqlite-framework:2.5.0-alpha04 (c) -+| | | \--- androidx.sqlite:sqlite-bundled:2.5.0-alpha04 (c) -+| | +--- androidx.sqlite:sqlite-framework:2.5.0-alpha04 -+| | | \--- androidx.sqlite:sqlite-framework-android:2.5.0-alpha04 ++| | | +--- androidx.sqlite:sqlite-framework:2.5.0-alpha05 (c) ++| | | \--- androidx.sqlite:sqlite-bundled:2.5.0-alpha05 (c) ++| | +--- androidx.sqlite:sqlite-framework:2.5.0-alpha05 ++| | | \--- androidx.sqlite:sqlite-framework-android:2.5.0-alpha05 +| | | +--- androidx.annotation:annotation:1.8.0 (*) -+| | | +--- androidx.sqlite:sqlite:2.5.0-alpha04 (*) ++| | | +--- androidx.sqlite:sqlite:2.5.0-alpha05 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*) -+| | | +--- androidx.sqlite:sqlite:2.5.0-alpha04 (c) -+| | | \--- androidx.sqlite:sqlite-bundled:2.5.0-alpha04 (c) ++| | | +--- androidx.sqlite:sqlite:2.5.0-alpha05 (c) ++| | | \--- androidx.sqlite:sqlite-bundled:2.5.0-alpha05 (c) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*) +| | +--- org.jetbrains.kotlinx:atomicfu:0.17.0 +| | | \--- org.jetbrains.kotlinx:atomicfu-jvm:0.17.0 +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.0 -> 2.0.0 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 -> 1.8.0 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 -> 1.8.0 (*) -+| | \--- androidx.room:room-common:2.7.0-alpha04 (c) ++| | \--- androidx.room:room-common:2.7.0-alpha05 (c) +| +--- org.jetbrains.kotlinx:kotlinx-datetime:0.6.0 +| | \--- org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.0 +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.21 -> 2.0.0 (*) @@ -930,8 +931,8 @@ +| | +--- androidx.core:core:1.6.0 -> 1.13.0 (*) +| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.8.2 (*) +| | +--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.8.2 (*) -+| | +--- androidx.room:room-runtime:2.5.0 -> 2.7.0-alpha04 (*) -+| | +--- androidx.sqlite:sqlite-framework:2.3.0 -> 2.5.0-alpha04 (*) ++| | +--- androidx.room:room-runtime:2.5.0 -> 2.7.0-alpha05 (*) ++| | +--- androidx.sqlite:sqlite-framework:2.3.0 -> 2.5.0-alpha05 (*) +| | +--- androidx.startup:startup-runtime:1.0.0 -> 1.1.1 (*) +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.21 -> 2.0.0 (*) @@ -969,13 +970,13 @@ +| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.2 (c) +| \--- androidx.lifecycle:lifecycle-common-java8:2.8.2 (c) ++--- androidx.lifecycle:lifecycle-viewmodel:2.8.2 (*) -++--- androidx.room:room-runtime:2.7.0-alpha04 (*) -++--- androidx.sqlite:sqlite-bundled:2.5.0-alpha04 -+| \--- androidx.sqlite:sqlite-bundled-android:2.5.0-alpha04 -+| +--- androidx.sqlite:sqlite:2.5.0-alpha04 (*) +++--- androidx.room:room-runtime:2.7.0-alpha05 (*) +++--- androidx.sqlite:sqlite-bundled:2.5.0-alpha05 ++| \--- androidx.sqlite:sqlite-bundled-android:2.5.0-alpha05 ++| +--- androidx.sqlite:sqlite:2.5.0-alpha05 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*) -+| +--- androidx.sqlite:sqlite:2.5.0-alpha04 (c) -+| \--- androidx.sqlite:sqlite-framework:2.5.0-alpha04 (c) ++| +--- androidx.sqlite:sqlite:2.5.0-alpha05 (c) ++| \--- androidx.sqlite:sqlite-framework:2.5.0-alpha05 (c) ++--- androidx.appcompat:appcompat:1.7.0 (*) ++--- com.mikepenz:iconics-core:5.5.0-b01 (*) ++--- io.noties.markwon:core:4.6.2 diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 4172bfe5b..7844c5dfd 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -633,36 +633,37 @@ ++--- org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.0 (*) ++--- project :data +| +--- org.jetbrains.kotlin:kotlin-stdlib:2.0.0 (*) -+| +--- androidx.room:room-runtime:2.7.0-alpha04 -+| | \--- androidx.room:room-runtime-android:2.7.0-alpha04 ++| +--- androidx.room:room-runtime:2.7.0-alpha05 ++| | \--- androidx.room:room-runtime-android:2.7.0-alpha05 +| | +--- androidx.annotation:annotation:1.8.0 (*) +| | +--- androidx.annotation:annotation-experimental:1.4.1 (*) +| | +--- androidx.arch.core:core-runtime:2.2.0 (*) -+| | +--- androidx.room:room-common:2.7.0-alpha04 -+| | | \--- androidx.room:room-common-jvm:2.7.0-alpha04 ++| | +--- androidx.collection:collection:1.4.0 (*) ++| | +--- androidx.room:room-common:2.7.0-alpha05 ++| | | \--- androidx.room:room-common-jvm:2.7.0-alpha05 +| | | +--- androidx.annotation:annotation:1.8.0 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*) -+| | | \--- androidx.room:room-runtime:2.7.0-alpha04 (c) -+| | +--- androidx.sqlite:sqlite:2.5.0-alpha04 -+| | | \--- androidx.sqlite:sqlite-android:2.5.0-alpha04 ++| | | \--- androidx.room:room-runtime:2.7.0-alpha05 (c) ++| | +--- androidx.sqlite:sqlite:2.5.0-alpha05 ++| | | \--- androidx.sqlite:sqlite-android:2.5.0-alpha05 +| | | +--- androidx.annotation:annotation:1.8.0 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*) -+| | | +--- androidx.sqlite:sqlite-framework:2.5.0-alpha04 (c) -+| | | \--- androidx.sqlite:sqlite-bundled:2.5.0-alpha04 (c) -+| | +--- androidx.sqlite:sqlite-framework:2.5.0-alpha04 -+| | | \--- androidx.sqlite:sqlite-framework-android:2.5.0-alpha04 ++| | | +--- androidx.sqlite:sqlite-framework:2.5.0-alpha05 (c) ++| | | \--- androidx.sqlite:sqlite-bundled:2.5.0-alpha05 (c) ++| | +--- androidx.sqlite:sqlite-framework:2.5.0-alpha05 ++| | | \--- androidx.sqlite:sqlite-framework-android:2.5.0-alpha05 +| | | +--- androidx.annotation:annotation:1.8.0 (*) -+| | | +--- androidx.sqlite:sqlite:2.5.0-alpha04 (*) ++| | | +--- androidx.sqlite:sqlite:2.5.0-alpha05 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*) -+| | | +--- androidx.sqlite:sqlite:2.5.0-alpha04 (c) -+| | | \--- androidx.sqlite:sqlite-bundled:2.5.0-alpha04 (c) ++| | | +--- androidx.sqlite:sqlite:2.5.0-alpha05 (c) ++| | | \--- androidx.sqlite:sqlite-bundled:2.5.0-alpha05 (c) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*) +| | +--- org.jetbrains.kotlinx:atomicfu:0.17.0 +| | | \--- org.jetbrains.kotlinx:atomicfu-jvm:0.17.0 +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.0 -> 2.0.0 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 -> 1.8.0 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 -> 1.8.0 (*) -+| | \--- androidx.room:room-common:2.7.0-alpha04 (c) ++| | \--- androidx.room:room-common:2.7.0-alpha05 (c) +| +--- org.jetbrains.kotlinx:kotlinx-datetime:0.6.0 +| | \--- org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.0 +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.21 -> 2.0.0 (*) @@ -1154,8 +1155,8 @@ +| | +--- androidx.core:core:1.6.0 -> 1.13.0 (*) +| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.8.2 (*) +| | +--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.8.2 (*) -+| | +--- androidx.room:room-runtime:2.5.0 -> 2.7.0-alpha04 (*) -+| | +--- androidx.sqlite:sqlite-framework:2.3.0 -> 2.5.0-alpha04 (*) ++| | +--- androidx.room:room-runtime:2.5.0 -> 2.7.0-alpha05 (*) ++| | +--- androidx.sqlite:sqlite-framework:2.3.0 -> 2.5.0-alpha05 (*) +| | +--- androidx.startup:startup-runtime:1.0.0 -> 1.1.1 (*) +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.21 -> 2.0.0 (*) @@ -1193,13 +1194,13 @@ +| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.2 (c) +| \--- androidx.lifecycle:lifecycle-common-java8:2.8.2 (c) ++--- androidx.lifecycle:lifecycle-viewmodel:2.8.2 (*) -++--- androidx.room:room-runtime:2.7.0-alpha04 (*) -++--- androidx.sqlite:sqlite-bundled:2.5.0-alpha04 -+| \--- androidx.sqlite:sqlite-bundled-android:2.5.0-alpha04 -+| +--- androidx.sqlite:sqlite:2.5.0-alpha04 (*) +++--- androidx.room:room-runtime:2.7.0-alpha05 (*) +++--- androidx.sqlite:sqlite-bundled:2.5.0-alpha05 ++| \--- androidx.sqlite:sqlite-bundled-android:2.5.0-alpha05 ++| +--- androidx.sqlite:sqlite:2.5.0-alpha05 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*) -+| +--- androidx.sqlite:sqlite:2.5.0-alpha04 (c) -+| \--- androidx.sqlite:sqlite-framework:2.5.0-alpha04 (c) ++| +--- androidx.sqlite:sqlite:2.5.0-alpha05 (c) ++| \--- androidx.sqlite:sqlite-framework:2.5.0-alpha05 (c) ++--- androidx.appcompat:appcompat:1.7.0 (*) ++--- com.mikepenz:iconics-core:5.5.0-b01 (*) ++--- io.noties.markwon:core:4.6.2 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 12e2a7ce6..51bb99424 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -53,7 +53,7 @@ preference = "1.2.1" recyclerview = "1.3.2" retrofit = "2.9.0" rfc5545-datetime = "0.2.4" -room = "2.7.0-alpha04" +room = "2.7.0-alpha05" shortcut-badger = "1.1.22" soloader = "0.11.0" timber = "5.0.1" @@ -85,7 +85,7 @@ androidx-preference = { module = "androidx.preference:preference", version.ref = androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" } androidx-room = { module = "androidx.room:room-runtime", version.ref = "room" } androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room"} -androidx-sqlite = { module = "androidx.sqlite:sqlite-bundled", version = "2.5.0-alpha04" } +androidx-sqlite = { module = "androidx.sqlite:sqlite-bundled", version = "2.5.0-alpha05" } androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" } androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test" } androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" }