From fc171c1e0a87104de2fe3e4577cff71965d6d1a0 Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Mon, 17 Jun 2024 16:15:20 +0700 Subject: [PATCH] refactor: Move database related stuff to data module --- .gitignore | 3 ++- app/build.gradle.kts | 12 --------- .../tachiyomi/data/database/DbOpenCallback.kt | 2 +- app/src/main/java/yokai/core/di/AppModule.kt | 2 +- .../main/java/yokai/data/DatabaseAdapter.kt | 20 -------------- data/build.gradle.kts | 13 ++++++++++ .../yokai/data/AndroidDatabaseHandler.kt | 1 - .../kotlin}/yokai/data/TransactionContext.kt | 0 .../data/database/DatabaseAdapter.kt | 26 ++++++++++++------- .../kotlin}/yokai/data/DatabaseHandler.kt | 1 - .../sqldelight/tachiyomi/data/categories.sq | 0 .../sqldelight/tachiyomi/data/chapters.sq | 0 .../tachiyomi/data/custom_manga_info.sq | 0 .../tachiyomi/data/extension_repos.sq | 0 .../sqldelight/tachiyomi/data/history.sq | 0 .../tachiyomi/data/manga_categories.sq | 0 .../sqldelight/tachiyomi/data/manga_sync.sq | 0 .../sqldelight/tachiyomi/data/mangas.sq | 0 .../sqldelight/tachiyomi/migrations/1.sqm | 0 .../sqldelight/tachiyomi/migrations/10.sqm | 0 .../sqldelight/tachiyomi/migrations/11.sqm | 0 .../sqldelight/tachiyomi/migrations/12.sqm | 0 .../sqldelight/tachiyomi/migrations/13.sqm | 0 .../sqldelight/tachiyomi/migrations/14.sqm | 0 .../sqldelight/tachiyomi/migrations/15.sqm | 0 .../sqldelight/tachiyomi/migrations/16.sqm | 0 .../sqldelight/tachiyomi/migrations/17.sqm | 0 .../sqldelight/tachiyomi/migrations/18.sqm | 0 .../sqldelight/tachiyomi/migrations/19.sqm | 0 .../sqldelight/tachiyomi/migrations/2.sqm | 0 .../sqldelight/tachiyomi/migrations/20.sqm | 0 .../sqldelight/tachiyomi/migrations/21.sqm | 0 .../sqldelight/tachiyomi/migrations/22.sqm | 0 .../sqldelight/tachiyomi/migrations/23.sqm | 0 .../sqldelight/tachiyomi/migrations/3.sqm | 0 .../sqldelight/tachiyomi/migrations/4.sqm | 0 .../sqldelight/tachiyomi/migrations/5.sqm | 0 .../sqldelight/tachiyomi/migrations/6.sqm | 0 .../sqldelight/tachiyomi/migrations/7.sqm | 0 .../sqldelight/tachiyomi/migrations/8.sqm | 0 .../sqldelight/tachiyomi/migrations/9.sqm | 0 .../sqldelight/tachiyomi/view/library_view.sq | 0 .../tachiyomi/view/scanlators_view.sq | 0 gradle/libs.versions.toml | 5 ++-- 44 files changed, 36 insertions(+), 49 deletions(-) delete mode 100644 app/src/main/java/yokai/data/DatabaseAdapter.kt rename {app/src/main/java => data/src/androidMain/kotlin}/yokai/data/AndroidDatabaseHandler.kt (99%) rename {app/src/main/java => data/src/androidMain/kotlin}/yokai/data/TransactionContext.kt (100%) rename {app/src/main/java => data/src/commonMain/kotlin}/yokai/data/DatabaseHandler.kt (97%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/data/categories.sq (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/data/chapters.sq (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/data/custom_manga_info.sq (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/data/extension_repos.sq (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/data/history.sq (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/data/manga_categories.sq (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/data/manga_sync.sq (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/data/mangas.sq (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/1.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/10.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/11.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/12.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/13.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/14.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/15.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/16.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/17.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/18.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/19.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/2.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/20.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/21.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/22.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/23.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/3.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/4.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/5.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/6.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/7.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/8.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/migrations/9.sqm (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/view/library_view.sq (100%) rename {app/src/main => data/src/commonMain}/sqldelight/tachiyomi/view/scanlators_view.sq (100%) diff --git a/.gitignore b/.gitignore index af291a578a..900ee93b33 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ .idea/ *iml *.iml -*/build \ No newline at end of file +*/build +*/*/build diff --git a/app/build.gradle.kts b/app/build.gradle.kts index cf5c8ddad6..54cff8e90c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -10,7 +10,6 @@ plugins { kotlin("plugin.serialization") id("kotlin-parcelize") id("com.google.android.gms.oss-licenses-plugin") - id("app.cash.sqldelight") id("com.google.gms.google-services") apply false id("com.google.firebase.crashlytics") apply false } @@ -141,16 +140,6 @@ android { } namespace = "eu.kanade.tachiyomi" - - sqldelight { - databases { - create("Database") { - packageName.set("tachiyomi.data") - dialect(libs.sqldelight.dialects.sql) - schemaOutputDirectory.set(project.file("./src/main/sqldelight")) - } - } - } } dependencies { @@ -223,7 +212,6 @@ dependencies { implementation(libs.play.services.gcm) // Database - implementation(libs.bundles.db) implementation(libs.sqlite.android) implementation(libs.bundles.sqlite) //noinspection UseTomlInstead diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt index daa6504f77..d1d250628c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt @@ -3,7 +3,7 @@ package eu.kanade.tachiyomi.data.database import androidx.sqlite.db.SupportSQLiteDatabase import app.cash.sqldelight.driver.android.AndroidSqliteDriver import co.touchlab.kermit.Logger -import tachiyomi.data.Database +import yokai.data.Database class DbOpenCallback : AndroidSqliteDriver.Callback(Database.Schema) { diff --git a/app/src/main/java/yokai/core/di/AppModule.kt b/app/src/main/java/yokai/core/di/AppModule.kt index 7c4fb05ce1..d1d3491452 100644 --- a/app/src/main/java/yokai/core/di/AppModule.kt +++ b/app/src/main/java/yokai/core/di/AppModule.kt @@ -27,13 +27,13 @@ import kotlinx.serialization.json.Json import nl.adaptivity.xmlutil.XmlDeclMode import nl.adaptivity.xmlutil.core.XmlVersion import nl.adaptivity.xmlutil.serialization.XML -import tachiyomi.data.Database import uy.kohesive.injekt.api.InjektModule import uy.kohesive.injekt.api.InjektRegistrar import uy.kohesive.injekt.api.addSingleton import uy.kohesive.injekt.api.addSingletonFactory import uy.kohesive.injekt.api.get import yokai.data.AndroidDatabaseHandler +import yokai.data.Database import yokai.data.DatabaseHandler import yokai.domain.SplashState import yokai.domain.storage.StorageManager diff --git a/app/src/main/java/yokai/data/DatabaseAdapter.kt b/app/src/main/java/yokai/data/DatabaseAdapter.kt deleted file mode 100644 index 9c60ce4a38..0000000000 --- a/app/src/main/java/yokai/data/DatabaseAdapter.kt +++ /dev/null @@ -1,20 +0,0 @@ -package yokai.data - -import app.cash.sqldelight.ColumnAdapter -import java.util.* - -val dateAdapter = object : ColumnAdapter { - override fun decode(databaseValue: Long): Date = Date(databaseValue) - override fun encode(value: Date): Long = value.time -} - -private const val listOfStringsSeparator = ", " -val listOfStringsAdapter = object : ColumnAdapter, String> { - override fun decode(databaseValue: String) = - if (databaseValue.isEmpty()) { - listOf() - } else { - databaseValue.split(listOfStringsSeparator) - } - override fun encode(value: List) = value.joinToString(separator = listOfStringsSeparator) -} diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 8872bbadc8..eec8932e7b 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -1,6 +1,7 @@ plugins { kotlin("multiplatform") kotlin("plugin.serialization") + id("app.cash.sqldelight") id("com.android.library") } @@ -9,10 +10,12 @@ kotlin { sourceSets { val commonMain by getting { dependencies { + api(libs.bundles.db) } } val androidMain by getting { dependencies { + api(libs.bundles.db.android) implementation(projects.sourceApi) } } @@ -22,3 +25,13 @@ kotlin { android { namespace = "yokai.data" } + +sqldelight { + databases { + create("Database") { + packageName.set("yokai.data") + dialect(libs.sqldelight.dialects.sql) + schemaOutputDirectory.set(project.file("./src/commonMain/sqldelight")) + } + } +} diff --git a/app/src/main/java/yokai/data/AndroidDatabaseHandler.kt b/data/src/androidMain/kotlin/yokai/data/AndroidDatabaseHandler.kt similarity index 99% rename from app/src/main/java/yokai/data/AndroidDatabaseHandler.kt rename to data/src/androidMain/kotlin/yokai/data/AndroidDatabaseHandler.kt index e66d3b2fe8..c32259d91b 100644 --- a/app/src/main/java/yokai/data/AndroidDatabaseHandler.kt +++ b/data/src/androidMain/kotlin/yokai/data/AndroidDatabaseHandler.kt @@ -10,7 +10,6 @@ import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.withContext -import tachiyomi.data.Database class AndroidDatabaseHandler( val db: Database, diff --git a/app/src/main/java/yokai/data/TransactionContext.kt b/data/src/androidMain/kotlin/yokai/data/TransactionContext.kt similarity index 100% rename from app/src/main/java/yokai/data/TransactionContext.kt rename to data/src/androidMain/kotlin/yokai/data/TransactionContext.kt diff --git a/data/src/commonMain/kotlin/eu/kanade/tachiyomi/data/database/DatabaseAdapter.kt b/data/src/commonMain/kotlin/eu/kanade/tachiyomi/data/database/DatabaseAdapter.kt index edc9910d50..05dc243cbf 100644 --- a/data/src/commonMain/kotlin/eu/kanade/tachiyomi/data/database/DatabaseAdapter.kt +++ b/data/src/commonMain/kotlin/eu/kanade/tachiyomi/data/database/DatabaseAdapter.kt @@ -1,6 +1,8 @@ package eu.kanade.tachiyomi.data.database +import app.cash.sqldelight.ColumnAdapter import eu.kanade.tachiyomi.source.model.UpdateStrategy +import java.util.* // TODO: Move to yokai.data.DatabaseAdapter @@ -13,14 +15,18 @@ val updateStrategyAdapter = object : ColumnAdapter { override fun encode(value: UpdateStrategy): Int = value.ordinal } -interface ColumnAdapter { - /** - * @return [databaseValue] decoded as type [T]. - */ - fun decode(databaseValue: S): T - - /** - * @return [value] encoded as database type [S]. - */ - fun encode(value: T): S +val dateAdapter = object : ColumnAdapter { + override fun decode(databaseValue: Long): Date = Date(databaseValue) + override fun encode(value: Date): Long = value.time +} + +private const val listOfStringsSeparator = ", " +val listOfStringsAdapter = object : ColumnAdapter, String> { + override fun decode(databaseValue: String) = + if (databaseValue.isEmpty()) { + listOf() + } else { + databaseValue.split(listOfStringsSeparator) + } + override fun encode(value: List) = value.joinToString(separator = listOfStringsSeparator) } diff --git a/app/src/main/java/yokai/data/DatabaseHandler.kt b/data/src/commonMain/kotlin/yokai/data/DatabaseHandler.kt similarity index 97% rename from app/src/main/java/yokai/data/DatabaseHandler.kt rename to data/src/commonMain/kotlin/yokai/data/DatabaseHandler.kt index 8297d8a927..46c04660df 100644 --- a/app/src/main/java/yokai/data/DatabaseHandler.kt +++ b/data/src/commonMain/kotlin/yokai/data/DatabaseHandler.kt @@ -2,7 +2,6 @@ package yokai.data import app.cash.sqldelight.Query import kotlinx.coroutines.flow.Flow -import tachiyomi.data.Database interface DatabaseHandler { suspend fun await(inTransaction: Boolean = false, block: suspend Database.() -> T): T diff --git a/app/src/main/sqldelight/tachiyomi/data/categories.sq b/data/src/commonMain/sqldelight/tachiyomi/data/categories.sq similarity index 100% rename from app/src/main/sqldelight/tachiyomi/data/categories.sq rename to data/src/commonMain/sqldelight/tachiyomi/data/categories.sq diff --git a/app/src/main/sqldelight/tachiyomi/data/chapters.sq b/data/src/commonMain/sqldelight/tachiyomi/data/chapters.sq similarity index 100% rename from app/src/main/sqldelight/tachiyomi/data/chapters.sq rename to data/src/commonMain/sqldelight/tachiyomi/data/chapters.sq diff --git a/app/src/main/sqldelight/tachiyomi/data/custom_manga_info.sq b/data/src/commonMain/sqldelight/tachiyomi/data/custom_manga_info.sq similarity index 100% rename from app/src/main/sqldelight/tachiyomi/data/custom_manga_info.sq rename to data/src/commonMain/sqldelight/tachiyomi/data/custom_manga_info.sq diff --git a/app/src/main/sqldelight/tachiyomi/data/extension_repos.sq b/data/src/commonMain/sqldelight/tachiyomi/data/extension_repos.sq similarity index 100% rename from app/src/main/sqldelight/tachiyomi/data/extension_repos.sq rename to data/src/commonMain/sqldelight/tachiyomi/data/extension_repos.sq diff --git a/app/src/main/sqldelight/tachiyomi/data/history.sq b/data/src/commonMain/sqldelight/tachiyomi/data/history.sq similarity index 100% rename from app/src/main/sqldelight/tachiyomi/data/history.sq rename to data/src/commonMain/sqldelight/tachiyomi/data/history.sq diff --git a/app/src/main/sqldelight/tachiyomi/data/manga_categories.sq b/data/src/commonMain/sqldelight/tachiyomi/data/manga_categories.sq similarity index 100% rename from app/src/main/sqldelight/tachiyomi/data/manga_categories.sq rename to data/src/commonMain/sqldelight/tachiyomi/data/manga_categories.sq diff --git a/app/src/main/sqldelight/tachiyomi/data/manga_sync.sq b/data/src/commonMain/sqldelight/tachiyomi/data/manga_sync.sq similarity index 100% rename from app/src/main/sqldelight/tachiyomi/data/manga_sync.sq rename to data/src/commonMain/sqldelight/tachiyomi/data/manga_sync.sq diff --git a/app/src/main/sqldelight/tachiyomi/data/mangas.sq b/data/src/commonMain/sqldelight/tachiyomi/data/mangas.sq similarity index 100% rename from app/src/main/sqldelight/tachiyomi/data/mangas.sq rename to data/src/commonMain/sqldelight/tachiyomi/data/mangas.sq diff --git a/app/src/main/sqldelight/tachiyomi/migrations/1.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/1.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/1.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/1.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/10.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/10.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/10.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/10.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/11.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/11.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/11.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/11.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/12.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/12.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/12.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/12.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/13.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/13.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/13.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/13.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/14.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/14.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/14.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/14.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/15.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/15.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/15.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/15.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/16.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/16.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/16.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/16.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/17.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/17.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/17.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/17.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/18.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/18.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/18.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/18.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/19.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/19.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/19.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/19.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/2.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/2.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/2.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/2.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/20.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/20.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/20.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/20.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/21.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/21.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/21.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/21.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/22.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/22.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/22.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/22.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/23.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/23.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/23.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/23.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/3.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/3.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/3.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/3.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/4.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/4.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/4.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/4.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/5.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/5.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/5.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/5.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/6.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/6.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/6.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/6.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/7.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/7.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/7.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/7.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/8.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/8.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/8.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/8.sqm diff --git a/app/src/main/sqldelight/tachiyomi/migrations/9.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/9.sqm similarity index 100% rename from app/src/main/sqldelight/tachiyomi/migrations/9.sqm rename to data/src/commonMain/sqldelight/tachiyomi/migrations/9.sqm diff --git a/app/src/main/sqldelight/tachiyomi/view/library_view.sq b/data/src/commonMain/sqldelight/tachiyomi/view/library_view.sq similarity index 100% rename from app/src/main/sqldelight/tachiyomi/view/library_view.sq rename to data/src/commonMain/sqldelight/tachiyomi/view/library_view.sq diff --git a/app/src/main/sqldelight/tachiyomi/view/scanlators_view.sq b/data/src/commonMain/sqldelight/tachiyomi/view/scanlators_view.sq similarity index 100% rename from app/src/main/sqldelight/tachiyomi/view/scanlators_view.sq rename to data/src/commonMain/sqldelight/tachiyomi/view/scanlators_view.sq diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5b46ed9d18..c6a8192c59 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -83,7 +83,7 @@ sqlite-framework = { module = "androidx.sqlite:sqlite-framework", version.ref = sqlite-ktx = { module = "androidx.sqlite:sqlite-ktx", version.ref = "sqlite" } sqlite-android = { module = "com.github.requery:sqlite-android", version = "3.45.0" } -sqldelight-coroutines = { module = "app.cash.sqldelight:coroutines-extensions-jvm", version.ref = "sqldelight" } +sqldelight-coroutines = { module = "app.cash.sqldelight:coroutines-extensions", version.ref = "sqldelight" } sqldelight-android-driver = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" } sqldelight-android-paging = { module = "app.cash.sqldelight:androidx-paging3-extensions", version.ref = "sqldelight" } sqldelight-dialects-sql = { module = "app.cash.sqldelight:sqlite-3-38-dialect", version.ref = "sqldelight" } @@ -104,7 +104,8 @@ gradle-versions = { id = "com.github.ben-manes.versions", version = "0.42.0" } [bundles] archive = [ "common-compress", "junrar" ] -db = [ "sqldelight-android-driver", "sqldelight-android-paging", "sqldelight-coroutines" ] +db = [ "sqldelight-coroutines" ] +db-android = [ "sqldelight-android-driver", "sqldelight-android-paging" ] coil = [ "coil3", "coil3-svg", "coil3-gif", "coil3-okhttp" ] logging = [ "kermit" ] sqlite = [ "sqlite-framework", "sqlite-ktx" ]