Revert "Don't use bundled sqlite driver"

This reverts commit 8c9b996cb8.
pull/2947/head
Alex Baker 1 year ago
parent 64ad4ca33a
commit bd7ad1ad9d

@ -184,6 +184,7 @@ dependencies {
implementation(libs.androidx.lifecycle.runtime.compose) implementation(libs.androidx.lifecycle.runtime.compose)
implementation(libs.androidx.lifecycle.viewmodel) implementation(libs.androidx.lifecycle.viewmodel)
implementation(libs.androidx.room) implementation(libs.androidx.room)
implementation(libs.androidx.sqlite)
implementation(libs.androidx.appcompat) implementation(libs.androidx.appcompat)
implementation(libs.iconics) implementation(libs.iconics)
implementation(libs.markwon) implementation(libs.markwon)

@ -2,6 +2,7 @@ package org.tasks.injection
import android.content.Context import android.content.Context
import androidx.room.Room import androidx.room.Room
import androidx.sqlite.driver.bundled.BundledSQLiteDriver
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
import dagger.hilt.InstallIn import dagger.hilt.InstallIn
@ -36,6 +37,7 @@ internal class ProductionModule {
context = context, context = context,
name = databaseFile.absolutePath name = databaseFile.absolutePath
) )
.setDriver(BundledSQLiteDriver())
.addMigrations(*Migrations.migrations(context, fileStorage)) .addMigrations(*Migrations.migrations(context, fileStorage))
if (!BuildConfig.DEBUG || !preferences.getBoolean(R.string.p_crash_main_queries, false)) { if (!BuildConfig.DEBUG || !preferences.getBoolean(R.string.p_crash_main_queries, false)) {
builder.allowMainThreadQueries() builder.allowMainThreadQueries()

@ -241,13 +241,15 @@
+| | | \--- androidx.sqlite:sqlite-android:2.5.0-alpha04 +| | | \--- androidx.sqlite:sqlite-android:2.5.0-alpha04
+| | | +--- androidx.annotation:annotation:1.8.0 (*) +| | | +--- androidx.annotation:annotation:1.8.0 (*)
+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.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:2.5.0-alpha04
+| | | \--- androidx.sqlite:sqlite-framework-android:2.5.0-alpha04 +| | | \--- androidx.sqlite:sqlite-framework-android:2.5.0-alpha04
+| | | +--- androidx.annotation:annotation:1.8.0 (*) +| | | +--- androidx.annotation:annotation:1.8.0 (*)
+| | | +--- androidx.sqlite:sqlite:2.5.0-alpha04 (*) +| | | +--- androidx.sqlite:sqlite:2.5.0-alpha04 (*)
+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*) +| | | +--- 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.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*)
+| | +--- org.jetbrains.kotlinx:atomicfu:0.17.0 +| | +--- org.jetbrains.kotlinx:atomicfu:0.17.0
+| | | \--- org.jetbrains.kotlinx:atomicfu-jvm: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-common-java8:2.8.2 (c)
++--- androidx.lifecycle:lifecycle-viewmodel:2.8.2 (*) ++--- androidx.lifecycle:lifecycle-viewmodel:2.8.2 (*)
++--- androidx.room:room-runtime:2.7.0-alpha04 (*) ++--- 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 (*) ++--- androidx.appcompat:appcompat:1.7.0 (*)
++--- com.mikepenz:iconics-core:5.5.0-b01 (*) ++--- com.mikepenz:iconics-core:5.5.0-b01 (*)
++--- io.noties.markwon:core:4.6.2 ++--- io.noties.markwon:core:4.6.2

@ -647,13 +647,15 @@
+| | | \--- androidx.sqlite:sqlite-android:2.5.0-alpha04 +| | | \--- androidx.sqlite:sqlite-android:2.5.0-alpha04
+| | | +--- androidx.annotation:annotation:1.8.0 (*) +| | | +--- androidx.annotation:annotation:1.8.0 (*)
+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.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:2.5.0-alpha04
+| | | \--- androidx.sqlite:sqlite-framework-android:2.5.0-alpha04 +| | | \--- androidx.sqlite:sqlite-framework-android:2.5.0-alpha04
+| | | +--- androidx.annotation:annotation:1.8.0 (*) +| | | +--- androidx.annotation:annotation:1.8.0 (*)
+| | | +--- androidx.sqlite:sqlite:2.5.0-alpha04 (*) +| | | +--- androidx.sqlite:sqlite:2.5.0-alpha04 (*)
+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*) +| | | +--- 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.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*)
+| | +--- org.jetbrains.kotlinx:atomicfu:0.17.0 +| | +--- org.jetbrains.kotlinx:atomicfu:0.17.0
+| | | \--- org.jetbrains.kotlinx:atomicfu-jvm: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-common-java8:2.8.2 (c)
++--- androidx.lifecycle:lifecycle-viewmodel:2.8.2 (*) ++--- androidx.lifecycle:lifecycle-viewmodel:2.8.2 (*)
++--- androidx.room:room-runtime:2.7.0-alpha04 (*) ++--- 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 (*) ++--- androidx.appcompat:appcompat:1.7.0 (*)
++--- com.mikepenz:iconics-core:5.5.0-b01 (*) ++--- com.mikepenz:iconics-core:5.5.0-b01 (*)
++--- io.noties.markwon:core:4.6.2 ++--- io.noties.markwon:core:4.6.2

Loading…
Cancel
Save