diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b4c54d034..d8d545d6e 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 50d583eb7..7cac23b8d 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -247,6 +247,7 @@ +| | | +--- androidx.annotation:annotation:1.8.1 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.0 (*) +| | | +--- androidx.sqlite:sqlite-framework:2.5.0-alpha12 (c) ++| | | +--- androidx.sqlite:sqlite-bundled:2.5.0-alpha12 (c) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (c) +| | +--- androidx.sqlite:sqlite-framework:2.5.0-alpha12 +| | | \--- androidx.sqlite:sqlite-framework-android:2.5.0-alpha12 @@ -254,6 +255,7 @@ +| | | +--- androidx.sqlite:sqlite:2.5.0-alpha12 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.0 (*) +| | | +--- androidx.sqlite:sqlite:2.5.0-alpha12 (c) ++| | | +--- androidx.sqlite:sqlite-bundled:2.5.0-alpha12 (c) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (c) +| | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.0 (*) +| | +--- org.jetbrains.kotlinx:atomicfu:0.17.0 -> 0.23.2 @@ -1171,6 +1173,13 @@ ++--- androidx.lifecycle:lifecycle-runtime-compose:2.8.7 (*) ++--- androidx.lifecycle:lifecycle-viewmodel:2.8.7 (*) ++--- androidx.room:room-runtime:2.7.0-alpha12 (*) +++--- androidx.sqlite:sqlite-bundled:2.5.0-alpha12 ++| \--- androidx.sqlite:sqlite-bundled-android:2.5.0-alpha12 ++| +--- androidx.sqlite:sqlite:2.5.0-alpha12 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.0 (*) ++| +--- androidx.sqlite:sqlite:2.5.0-alpha12 (c) ++| +--- androidx.sqlite:sqlite-framework:2.5.0-alpha12 (c) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (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 a89322dd6..d9e0ba537 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -808,6 +808,7 @@ +| | | +--- androidx.annotation:annotation:1.8.1 -> 1.9.0 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.0 (*) +| | | +--- androidx.sqlite:sqlite-framework:2.5.0-alpha12 (c) ++| | | +--- androidx.sqlite:sqlite-bundled:2.5.0-alpha12 (c) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (c) +| | +--- androidx.sqlite:sqlite-framework:2.5.0-alpha12 +| | | \--- androidx.sqlite:sqlite-framework-android:2.5.0-alpha12 @@ -815,6 +816,7 @@ +| | | +--- androidx.sqlite:sqlite:2.5.0-alpha12 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.0 (*) +| | | +--- androidx.sqlite:sqlite:2.5.0-alpha12 (c) ++| | | +--- androidx.sqlite:sqlite-bundled:2.5.0-alpha12 (c) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (c) +| | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.0 (*) +| | +--- org.jetbrains.kotlinx:atomicfu:0.17.0 -> 0.23.2 @@ -1521,6 +1523,13 @@ ++--- androidx.lifecycle:lifecycle-runtime-compose:2.8.7 (*) ++--- androidx.lifecycle:lifecycle-viewmodel:2.8.7 (*) ++--- androidx.room:room-runtime:2.7.0-alpha12 (*) +++--- androidx.sqlite:sqlite-bundled:2.5.0-alpha12 ++| \--- androidx.sqlite:sqlite-bundled-android:2.5.0-alpha12 ++| +--- androidx.sqlite:sqlite:2.5.0-alpha12 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.0 (*) ++| +--- androidx.sqlite:sqlite:2.5.0-alpha12 (c) ++| +--- androidx.sqlite:sqlite-framework:2.5.0-alpha12 (c) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (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 6f9546860..de621752c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -91,6 +91,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-alpha12" } 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" }