From bd7ad1ad9db4edcd73d527a34301799a5de066ff Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 9 Jul 2024 01:51:51 -0500 Subject: [PATCH] Revert "Don't use bundled sqlite driver" This reverts commit 8c9b996cb8071f1098e876906cc3e78177233482. --- app/build.gradle.kts | 1 + .../java/org/tasks/injection/ProductionModule.kt | 2 ++ deps_fdroid.txt | 12 ++++++++++-- deps_googleplay.txt | 12 ++++++++++-- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 191ea3976..121dc89b3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -184,6 +184,7 @@ dependencies { implementation(libs.androidx.lifecycle.runtime.compose) implementation(libs.androidx.lifecycle.viewmodel) implementation(libs.androidx.room) + implementation(libs.androidx.sqlite) implementation(libs.androidx.appcompat) implementation(libs.iconics) implementation(libs.markwon) diff --git a/app/src/main/java/org/tasks/injection/ProductionModule.kt b/app/src/main/java/org/tasks/injection/ProductionModule.kt index efe71de18..7de63a7bc 100644 --- a/app/src/main/java/org/tasks/injection/ProductionModule.kt +++ b/app/src/main/java/org/tasks/injection/ProductionModule.kt @@ -2,6 +2,7 @@ package org.tasks.injection import android.content.Context import androidx.room.Room +import androidx.sqlite.driver.bundled.BundledSQLiteDriver import dagger.Module import dagger.Provides import dagger.hilt.InstallIn @@ -36,6 +37,7 @@ internal class ProductionModule { context = context, name = databaseFile.absolutePath ) + .setDriver(BundledSQLiteDriver()) .addMigrations(*Migrations.migrations(context, fileStorage)) if (!BuildConfig.DEBUG || !preferences.getBoolean(R.string.p_crash_main_queries, false)) { builder.allowMainThreadQueries() diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 54a9b5432..b224c9980 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -241,13 +241,15 @@ +| | | \--- androidx.sqlite:sqlite-android:2.5.0-alpha04 +| | | +--- 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-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.annotation:annotation:1.8.0 (*) +| | | +--- androidx.sqlite:sqlite:2.5.0-alpha04 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*) -+| | | \--- androidx.sqlite:sqlite:2.5.0-alpha04 (c) ++| | | +--- androidx.sqlite:sqlite:2.5.0-alpha04 (c) ++| | | \--- androidx.sqlite:sqlite-bundled:2.5.0-alpha04 (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 @@ -968,6 +970,12 @@ +| \--- 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 (*) ++| +--- 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.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 9a7894cde..152880398 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -647,13 +647,15 @@ +| | | \--- androidx.sqlite:sqlite-android:2.5.0-alpha04 +| | | +--- 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-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.annotation:annotation:1.8.0 (*) +| | | +--- androidx.sqlite:sqlite:2.5.0-alpha04 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*) -+| | | \--- androidx.sqlite:sqlite:2.5.0-alpha04 (c) ++| | | +--- androidx.sqlite:sqlite:2.5.0-alpha04 (c) ++| | | \--- androidx.sqlite:sqlite-bundled:2.5.0-alpha04 (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 @@ -1192,6 +1194,12 @@ +| \--- 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 (*) ++| +--- 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.appcompat:appcompat:1.7.0 (*) ++--- com.mikepenz:iconics-core:5.5.0-b01 (*) ++--- io.noties.markwon:core:4.6.2