From 8da84914d06a3630d564e3b31a051b8b3b96ef46 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 29 Sep 2021 17:13:43 -0500 Subject: [PATCH] Room 2.4.0-alpha05 --- app/build.gradle.kts | 1 - buildSrc/src/main/kotlin/Versions.kt | 2 +- deps_fdroid.txt | 32 ++++++++++++++-------------- deps_googleplay.txt | 32 ++++++++++++++-------------- 4 files changed, 33 insertions(+), 34 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 875e611d8..18f052c86 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -182,7 +182,6 @@ dependencies { implementation("androidx.lifecycle:lifecycle-runtime-ktx:${Versions.lifecycle}") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.lifecycle}") implementation("androidx.room:room-ktx:${Versions.room}") - kapt("org.xerial:sqlite-jdbc:3.34.0") kapt("androidx.room:room-compiler:${Versions.room}") implementation("androidx.appcompat:appcompat:1.3.1") implementation("io.reactivex.rxjava2:rxandroid:2.1.1") diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index eb947a7eb..323b3d950 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -5,7 +5,7 @@ object Versions { const val minSdk = 24 const val work = "2.7.0-beta01" const val leakcanary = "2.7" - const val room = "2.3.0" + const val room = "2.4.0-alpha05" const val crashlytics = "18.2.1" const val analytics = "19.0.1" const val remote_config = "21.0.1" diff --git a/deps_fdroid.txt b/deps_fdroid.txt index ed665db81..a3753a54c 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -83,7 +83,7 @@ +| | | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 (*) +| | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1 (*) +| | | +--- androidx.savedstate:savedstate:1.1.0 (*) -+| | | \--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0 ++| | | \--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0-rc01 +| | +--- androidx.lifecycle:lifecycle-common:2.2.0 -> 2.3.1 (*) +| | +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| | +--- androidx.lifecycle:lifecycle-process:2.2.0 @@ -191,7 +191,7 @@ +| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| | | \--- androidx.print:print:1.0.0 +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0 ++| | +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0-rc01 +| | +--- androidx.fragment:fragment:1.0.0 -> 1.3.6 (*) +| | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.1 (*) +| | +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 @@ -236,25 +236,25 @@ +| +--- androidx.hilt:hilt-common:1.0.0 +| | \--- com.google.dagger:hilt-core:2.35 -> 2.38.1 (*) +| +--- androidx.work:work-runtime:2.3.4 -> 2.7.0-beta01 -+| | +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0 ++| | +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0-rc01 +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.2.0 (*) +| | +--- androidx.startup:startup-runtime:1.0.0 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | | \--- androidx.tracing:tracing:1.0.0 (*) +| | +--- androidx.core:core:1.5.0-beta01 -> 1.5.0 (*) -+| | +--- androidx.room:room-runtime:2.2.5 -> 2.3.0 -+| | | +--- androidx.room:room-common:2.3.0 ++| | +--- androidx.room:room-runtime:2.2.5 -> 2.4.0-alpha05 ++| | | +--- androidx.room:room-common:2.4.0-alpha05 +| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.sqlite:sqlite-framework:2.1.0 ++| | | +--- androidx.sqlite:sqlite-framework:2.2.0-alpha02 +| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | | \--- androidx.sqlite:sqlite:2.1.0 ++| | | | \--- androidx.sqlite:sqlite:2.2.0-alpha02 +| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | +--- androidx.sqlite:sqlite:2.1.0 (*) ++| | | +--- androidx.sqlite:sqlite:2.2.0-alpha02 (*) +| | | +--- androidx.arch.core:core-runtime:2.0.1 -> 2.1.0 (*) -+| | | \--- androidx.annotation:annotation-experimental:1.1.0 -+| | +--- androidx.sqlite:sqlite:2.1.0 (*) -+| | +--- androidx.sqlite:sqlite-framework:2.1.0 (*) ++| | | \--- androidx.annotation:annotation-experimental:1.1.0-rc01 ++| | +--- androidx.sqlite:sqlite:2.1.0 -> 2.2.0-alpha02 (*) ++| | +--- androidx.sqlite:sqlite-framework:2.1.0 -> 2.2.0-alpha02 (*) +| | +--- androidx.core:core:1.1.0 -> 1.5.0 (*) +| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*) +| \--- com.google.dagger:hilt-android:2.35 -> 2.38.1 (*) @@ -279,11 +279,11 @@ +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.30 (*) ++--- 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.3.0 -+| +--- androidx.room:room-common:2.3.0 (*) -+| +--- androidx.room:room-runtime:2.3.0 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.5.30 (*) -+| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.0 (*) +++--- androidx.room:room-ktx:2.4.0-alpha05 ++| +--- androidx.room:room-common:2.4.0-alpha05 (*) ++| +--- androidx.room:room-runtime:2.4.0-alpha05 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) ++| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0 (*) ++--- androidx.appcompat:appcompat:1.3.1 (*) ++--- io.reactivex.rxjava2:rxandroid:2.1.1 +| \--- io.reactivex.rxjava2:rxjava:2.2.6 diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 51cf1e3b8..6d40993ba 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -83,7 +83,7 @@ +| | | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 (*) +| | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1 (*) +| | | +--- androidx.savedstate:savedstate:1.1.0 (*) -+| | | \--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0 ++| | | \--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0-rc01 +| | +--- androidx.lifecycle:lifecycle-common:2.2.0 -> 2.3.1 (*) +| | +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| | +--- androidx.lifecycle:lifecycle-process:2.2.0 @@ -310,7 +310,7 @@ +| | | +--- androidx.core:core:1.0.0 -> 1.5.0 (*) +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | | \--- androidx.legacy:legacy-support-core-utils:1.0.0 (*) -+| | +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0 ++| | +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0-rc01 +| | +--- androidx.fragment:fragment:1.0.0 -> 1.3.6 (*) +| | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.3.1 (*) +| | +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 @@ -355,25 +355,25 @@ +| +--- androidx.hilt:hilt-common:1.0.0 +| | \--- com.google.dagger:hilt-core:2.35 -> 2.38.1 (*) +| +--- androidx.work:work-runtime:2.3.4 -> 2.7.0-beta01 -+| | +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0 ++| | +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0-rc01 +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.2.0 (*) +| | +--- androidx.startup:startup-runtime:1.0.0 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | | \--- androidx.tracing:tracing:1.0.0 (*) +| | +--- androidx.core:core:1.5.0-beta01 -> 1.5.0 (*) -+| | +--- androidx.room:room-runtime:2.2.5 -> 2.3.0 -+| | | +--- androidx.room:room-common:2.3.0 ++| | +--- androidx.room:room-runtime:2.2.5 -> 2.4.0-alpha05 ++| | | +--- androidx.room:room-common:2.4.0-alpha05 +| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0 -+| | | +--- androidx.sqlite:sqlite-framework:2.1.0 ++| | | +--- androidx.sqlite:sqlite-framework:2.2.0-alpha02 +| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | | \--- androidx.sqlite:sqlite:2.1.0 ++| | | | \--- androidx.sqlite:sqlite:2.2.0-alpha02 +| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | +--- androidx.sqlite:sqlite:2.1.0 (*) ++| | | +--- androidx.sqlite:sqlite:2.2.0-alpha02 (*) +| | | +--- androidx.arch.core:core-runtime:2.0.1 -> 2.1.0 (*) -+| | | \--- androidx.annotation:annotation-experimental:1.1.0 -+| | +--- androidx.sqlite:sqlite:2.1.0 (*) -+| | +--- androidx.sqlite:sqlite-framework:2.1.0 (*) ++| | | \--- androidx.annotation:annotation-experimental:1.1.0-rc01 ++| | +--- androidx.sqlite:sqlite:2.1.0 -> 2.2.0-alpha02 (*) ++| | +--- androidx.sqlite:sqlite-framework:2.1.0 -> 2.2.0-alpha02 (*) +| | +--- androidx.core:core:1.1.0 -> 1.5.0 (*) +| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*) +| \--- com.google.dagger:hilt-android:2.35 -> 2.38.1 (*) @@ -398,11 +398,11 @@ +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.30 (*) ++--- 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.3.0 -+| +--- androidx.room:room-common:2.3.0 (*) -+| +--- androidx.room:room-runtime:2.3.0 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 -> 1.5.30 (*) -+| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.0 (*) +++--- androidx.room:room-ktx:2.4.0-alpha05 ++| +--- androidx.room:room-common:2.4.0-alpha05 (*) ++| +--- androidx.room:room-runtime:2.4.0-alpha05 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (*) ++| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0 (*) ++--- androidx.appcompat:appcompat:1.3.1 (*) ++--- io.reactivex.rxjava2:rxandroid:2.1.1 +| \--- io.reactivex.rxjava2:rxjava:2.2.6