From 2704c800cef4e6f505553ad3fdcb447fca3c8314 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 5 Jun 2021 14:00:02 +0530 Subject: [PATCH] database: fixup package names Signed-off-by: Harsh Shandilya --- .../kotlin/dev/msfjarvis/claw/common/posts/LobstersItem.kt | 2 +- database/build.gradle.kts | 2 +- database/consumer-rules.pro | 2 +- database/src/androidMain/AndroidManifest.xml | 2 +- .../{lobsters/data => claw/database}/local/Database.kt | 4 ++-- .../{lobsters/data => claw/database}/local/Database.kt | 6 +++--- .../{lobsters/data => claw/database}/model/TagsAdapter.kt | 2 +- .../{lobsters/data => claw/database}/local/SavedPost.sq | 0 .../{lobsters/data => claw/database}/local/Database.kt | 4 ++-- .../data => claw/database}/local/SqlDelightQueriesTest.kt | 6 +++--- 10 files changed, 15 insertions(+), 15 deletions(-) rename database/src/androidMain/kotlin/dev/msfjarvis/{lobsters/data => claw/database}/local/Database.kt (77%) rename database/src/commonMain/kotlin/dev/msfjarvis/{lobsters/data => claw/database}/local/Database.kt (72%) rename database/src/commonMain/kotlin/dev/msfjarvis/{lobsters/data => claw/database}/model/TagsAdapter.kt (90%) rename database/src/commonMain/sqldelight/dev/msfjarvis/{lobsters/data => claw/database}/local/SavedPost.sq (100%) rename database/src/desktopMain/kotlin/dev/msfjarvis/{lobsters/data => claw/database}/local/Database.kt (76%) rename database/src/desktopTest/kotlin/dev/msfjarvis/{lobsters/data => claw/database}/local/SqlDelightQueriesTest.kt (96%) diff --git a/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/posts/LobstersItem.kt b/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/posts/LobstersItem.kt index 504063b7..4b6a5b95 100644 --- a/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/posts/LobstersItem.kt +++ b/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/posts/LobstersItem.kt @@ -32,7 +32,7 @@ import dev.msfjarvis.claw.common.res.commentIcon import dev.msfjarvis.claw.common.res.heartBorderIcon import dev.msfjarvis.claw.common.res.heartIcon import dev.msfjarvis.claw.common.theme.titleColor -import dev.msfjarvis.lobsters.data.local.SavedPost +import dev.msfjarvis.claw.database.local.SavedPost import io.kamel.image.KamelImage import io.kamel.image.lazyImageResource diff --git a/database/build.gradle.kts b/database/build.gradle.kts index b01ff8b8..288df229 100644 --- a/database/build.gradle.kts +++ b/database/build.gradle.kts @@ -38,7 +38,7 @@ android { configure { database("LobstersDatabase") { - packageName = "dev.msfjarvis.lobsters.database" + packageName = "dev.msfjarvis.claw.database" sourceFolders = listOf("sqldelight") } } diff --git a/database/consumer-rules.pro b/database/consumer-rules.pro index a4b76f7c..f6a22ac0 100644 --- a/database/consumer-rules.pro +++ b/database/consumer-rules.pro @@ -1 +1 @@ --keep class dev.msfjarvis.lobsters.model.** { *; } +-keep class dev.msfjarvis.claw.database.model.** { *; } diff --git a/database/src/androidMain/AndroidManifest.xml b/database/src/androidMain/AndroidManifest.xml index b309dc28..29a2c894 100644 --- a/database/src/androidMain/AndroidManifest.xml +++ b/database/src/androidMain/AndroidManifest.xml @@ -1,4 +1,4 @@ diff --git a/database/src/androidMain/kotlin/dev/msfjarvis/lobsters/data/local/Database.kt b/database/src/androidMain/kotlin/dev/msfjarvis/claw/database/local/Database.kt similarity index 77% rename from database/src/androidMain/kotlin/dev/msfjarvis/lobsters/data/local/Database.kt rename to database/src/androidMain/kotlin/dev/msfjarvis/claw/database/local/Database.kt index 37209b72..94423f6c 100644 --- a/database/src/androidMain/kotlin/dev/msfjarvis/lobsters/data/local/Database.kt +++ b/database/src/androidMain/kotlin/dev/msfjarvis/claw/database/local/Database.kt @@ -1,9 +1,9 @@ -package dev.msfjarvis.lobsters.data.local +package dev.msfjarvis.claw.database.local import android.content.Context import com.squareup.sqldelight.android.AndroidSqliteDriver import com.squareup.sqldelight.db.SqlDriver -import dev.msfjarvis.lobsters.database.LobstersDatabase +import dev.msfjarvis.claw.database.LobstersDatabase actual class DriverFactory(private val context: Context) { actual fun createDriver(): SqlDriver { diff --git a/database/src/commonMain/kotlin/dev/msfjarvis/lobsters/data/local/Database.kt b/database/src/commonMain/kotlin/dev/msfjarvis/claw/database/local/Database.kt similarity index 72% rename from database/src/commonMain/kotlin/dev/msfjarvis/lobsters/data/local/Database.kt rename to database/src/commonMain/kotlin/dev/msfjarvis/claw/database/local/Database.kt index 1ab3266e..779a812f 100644 --- a/database/src/commonMain/kotlin/dev/msfjarvis/lobsters/data/local/Database.kt +++ b/database/src/commonMain/kotlin/dev/msfjarvis/claw/database/local/Database.kt @@ -1,8 +1,8 @@ -package dev.msfjarvis.lobsters.data.local +package dev.msfjarvis.claw.database.local import com.squareup.sqldelight.db.SqlDriver -import dev.msfjarvis.lobsters.data.model.TagsAdapter -import dev.msfjarvis.lobsters.database.LobstersDatabase +import dev.msfjarvis.claw.database.LobstersDatabase +import dev.msfjarvis.claw.database.model.TagsAdapter internal const val LobstersDatabaseName = "SavedPosts.db" diff --git a/database/src/commonMain/kotlin/dev/msfjarvis/lobsters/data/model/TagsAdapter.kt b/database/src/commonMain/kotlin/dev/msfjarvis/claw/database/model/TagsAdapter.kt similarity index 90% rename from database/src/commonMain/kotlin/dev/msfjarvis/lobsters/data/model/TagsAdapter.kt rename to database/src/commonMain/kotlin/dev/msfjarvis/claw/database/model/TagsAdapter.kt index 3b8fcb48..0be2d607 100644 --- a/database/src/commonMain/kotlin/dev/msfjarvis/lobsters/data/model/TagsAdapter.kt +++ b/database/src/commonMain/kotlin/dev/msfjarvis/claw/database/model/TagsAdapter.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.lobsters.data.model +package dev.msfjarvis.claw.database.model import com.squareup.sqldelight.ColumnAdapter diff --git a/database/src/commonMain/sqldelight/dev/msfjarvis/lobsters/data/local/SavedPost.sq b/database/src/commonMain/sqldelight/dev/msfjarvis/claw/database/local/SavedPost.sq similarity index 100% rename from database/src/commonMain/sqldelight/dev/msfjarvis/lobsters/data/local/SavedPost.sq rename to database/src/commonMain/sqldelight/dev/msfjarvis/claw/database/local/SavedPost.sq diff --git a/database/src/desktopMain/kotlin/dev/msfjarvis/lobsters/data/local/Database.kt b/database/src/desktopMain/kotlin/dev/msfjarvis/claw/database/local/Database.kt similarity index 76% rename from database/src/desktopMain/kotlin/dev/msfjarvis/lobsters/data/local/Database.kt rename to database/src/desktopMain/kotlin/dev/msfjarvis/claw/database/local/Database.kt index 9883a8a3..ad2a5aa3 100644 --- a/database/src/desktopMain/kotlin/dev/msfjarvis/lobsters/data/local/Database.kt +++ b/database/src/desktopMain/kotlin/dev/msfjarvis/claw/database/local/Database.kt @@ -1,8 +1,8 @@ -package dev.msfjarvis.lobsters.data.local +package dev.msfjarvis.claw.database.local import com.squareup.sqldelight.db.SqlDriver import com.squareup.sqldelight.sqlite.driver.JdbcSqliteDriver -import dev.msfjarvis.lobsters.database.LobstersDatabase +import dev.msfjarvis.claw.database.LobstersDatabase actual class DriverFactory { actual fun createDriver(): SqlDriver { diff --git a/database/src/desktopTest/kotlin/dev/msfjarvis/lobsters/data/local/SqlDelightQueriesTest.kt b/database/src/desktopTest/kotlin/dev/msfjarvis/claw/database/local/SqlDelightQueriesTest.kt similarity index 96% rename from database/src/desktopTest/kotlin/dev/msfjarvis/lobsters/data/local/SqlDelightQueriesTest.kt rename to database/src/desktopTest/kotlin/dev/msfjarvis/claw/database/local/SqlDelightQueriesTest.kt index 5ca12981..a4bc5e26 100644 --- a/database/src/desktopTest/kotlin/dev/msfjarvis/lobsters/data/local/SqlDelightQueriesTest.kt +++ b/database/src/desktopTest/kotlin/dev/msfjarvis/claw/database/local/SqlDelightQueriesTest.kt @@ -1,8 +1,8 @@ -package dev.msfjarvis.lobsters.data.local +package dev.msfjarvis.claw.database.local import com.squareup.sqldelight.sqlite.driver.JdbcSqliteDriver -import dev.msfjarvis.lobsters.data.model.TagsAdapter -import dev.msfjarvis.lobsters.database.LobstersDatabase +import dev.msfjarvis.claw.database.LobstersDatabase +import dev.msfjarvis.claw.database.model.TagsAdapter import kotlin.test.Test import kotlin.test.assertEquals import kotlinx.coroutines.runBlocking