refactor: split up room into a module, and move client module

shared/data/build.gradle.kts

@@ -0,0 +1,52 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    alias(libs.plugins.kotlinMultiplatform)
+    alias(libs.plugins.kotlinSerialization)
+    alias(libs.plugins.androidMultiplatformLibrary)
+    alias(libs.plugins.ksp)
+}
+
+kotlin {
+    android {
+        namespace = "moe.lava.banksia.core.data"
+        compileSdk = libs.versions.android.compileSdk.get().toInt()
+
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
+        }
+    }
+
+    compilerOptions {
+        freeCompilerArgs.add("-opt-in=kotlin.time.ExperimentalTime")
+    }
+
+    iosArm64()
+    iosSimulatorArm64()
+
+    jvm()
+
+    sourceSets {
+        androidMain.dependencies {
+            implementation(libs.koin.compose)
+            implementation(libs.ktor.client.okhttp)
+        }
+        commonMain.dependencies {
+            implementation(libs.okio)
+            implementation(libs.koin.core)
+            implementation(libs.ktor.client.core)
+            implementation(libs.ktor.client.contentnegotiation)
+            implementation(libs.ktor.serialization.kotlinx.json)
+            implementation(libs.kotlinx.coroutines.core)
+            implementation(libs.kotlinx.datetime)
+            implementation(libs.kotlinx.serialization.json)
+            implementation(libs.kotlinx.serialization.protobuf)
+
+            implementation(projects.shared)
+            implementation(projects.shared.room)
+        }
+        iosMain.dependencies {
+            implementation(libs.ktor.client.darwin)
+        }
+    }
+}

shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/DataDiModule.kt

@@ -0,0 +1,62 @@
+package moe.lava.banksia.core.data
+
+import io.ktor.client.HttpClient
+import io.ktor.client.plugins.HttpSend
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.plugins.defaultRequest
+import io.ktor.client.plugins.plugin
+import io.ktor.serialization.kotlinx.json.json
+import kotlinx.serialization.json.Json
+import moe.lava.banksia.Constants
+import moe.lava.banksia.core.data.repositories.RouteRepository
+import moe.lava.banksia.core.data.repositories.StopRepository
+import moe.lava.banksia.core.data.repositories.StopTimeRepository
+import moe.lava.banksia.core.data.sources.route.RouteLocalDataSource
+import moe.lava.banksia.core.data.sources.route.RouteRemoteDataSource
+import moe.lava.banksia.core.data.sources.stop.StopLocalDataSource
+import moe.lava.banksia.core.data.sources.stop.StopRemoteDataSource
+import moe.lava.banksia.core.data.sources.stoptime.StopTimeLocalDataSource
+import moe.lava.banksia.core.data.sources.stoptime.StopTimeRemoteDataSource
+import moe.lava.banksia.core.room.roomDiModule
+import moe.lava.banksia.data.ptv.PtvService
+import moe.lava.banksia.util.log
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.module
+
+val dataDiModule = module {
+    includes(roomDiModule)
+
+    // HTTP Clients
+    singleOf(::PtvService)
+    single {
+        HttpClient {
+            install(ContentNegotiation) {
+                json(Json {
+                    ignoreUnknownKeys = true
+                })
+            }
+            defaultRequest {
+                url(Constants.serverUrl)
+            }
+        }.also { client ->
+            client.plugin(HttpSend).intercept { req ->
+                val fullPath = req.url.build().encodedPathAndQuery
+                log("ktor.client", fullPath)
+                execute(req)
+            }
+        }
+    }
+
+    // Data sources
+    singleOf(::RouteLocalDataSource)
+    singleOf(::RouteRemoteDataSource)
+    singleOf(::StopLocalDataSource)
+    singleOf(::StopRemoteDataSource)
+    singleOf(::StopTimeLocalDataSource)
+    singleOf(::StopTimeRemoteDataSource)
+
+    // Repositories
+    singleOf(::RouteRepository)
+    singleOf(::StopRepository)
+    singleOf(::StopTimeRepository)
+}

shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/RouteRepository.kt

@@ -0,0 +1,25 @@
+package moe.lava.banksia.core.data.repositories
+
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import moe.lava.banksia.core.data.sources.route.RouteLocalDataSource
+import moe.lava.banksia.core.data.sources.route.RouteRemoteDataSource
+
+class RouteRepository internal constructor(
+    private val local: RouteLocalDataSource,
+    private val remote: RouteRemoteDataSource,
+) {
+    private val mutex = Mutex()
+    suspend fun getAll() = mutex.withLock {
+        local
+            .getAll()
+            .map { it.asModel() }
+            .ifEmpty {
+                remote
+                    .getAll()
+                    .also { local.save(*it.toTypedArray()) }
+            }
+    }
+
+    suspend fun get(id: String) = mutex.withLock { local.get(id)?.asModel() ?: remote.get(id) }
+}

shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/StopRepository.kt

@@ -0,0 +1,22 @@
+package moe.lava.banksia.core.data.repositories
+
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import moe.lava.banksia.core.data.sources.stop.StopLocalDataSource
+import moe.lava.banksia.core.data.sources.stop.StopRemoteDataSource
+
+class StopRepository internal constructor(
+    private val local: StopLocalDataSource,
+    private val remote: StopRemoteDataSource,
+) {
+    private val mutex = Mutex()
+
+    suspend fun get(id: String) = mutex.withLock { local.get(id)?.asModel() ?: remote.get(id) }
+    suspend fun getByRoute(id: String) = mutex.withLock {
+        local
+            .getByRoute(id)
+            .map { it.asModel() }
+            .ifEmpty { null }
+            ?: remote.getByRoute(id)
+    }
+}

shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/repositories/StopTimeRepository.kt

@@ -0,0 +1,16 @@
+package moe.lava.banksia.core.data.repositories
+
+import moe.lava.banksia.core.data.sources.stoptime.StopTimeLocalDataSource
+import moe.lava.banksia.core.data.sources.stoptime.StopTimeRemoteDataSource
+import moe.lava.banksia.model.StopTimeDated
+
+class StopTimeRepository internal constructor(
+    private val local: StopTimeLocalDataSource,
+    private val remote: StopTimeRemoteDataSource,
+) {
+    suspend fun getForStop(id: String): List<StopTimeDated> {
+        return local
+            .getAtStop(id)
+            .ifEmpty { remote.getAtStop(id) }
+    }
+}

shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/route/RouteLocalDataSource.kt

@@ -0,0 +1,11 @@
+package moe.lava.banksia.core.data.sources.route
+
+import moe.lava.banksia.core.room.dao.RouteDao
+import moe.lava.banksia.core.room.entity.asEntity
+import moe.lava.banksia.model.Route
+
+internal class RouteLocalDataSource(private val dao: RouteDao) {
+    suspend fun get(id: String) = dao.get(id)
+    suspend fun getAll() = dao.getAll()
+    suspend fun save(vararg routes: Route) = dao.insertOrReplaceAll(*routes.map { it.asEntity() }.toTypedArray())
+}

shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/route/RouteRemoteDataSource.kt

@@ -0,0 +1,11 @@
+package moe.lava.banksia.core.data.sources.route
+
+import io.ktor.client.HttpClient
+import io.ktor.client.call.body
+import io.ktor.client.request.get
+import moe.lava.banksia.model.Route
+
+internal class RouteRemoteDataSource(val client: HttpClient) {
+    suspend fun get(id: String) = client.get("routes/${id}").body<Route>()
+    suspend fun getAll() = client.get("routes").body<List<Route>>()
+}

shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stop/StopLocalDataSource.kt

@@ -0,0 +1,12 @@
+package moe.lava.banksia.core.data.sources.stop
+
+import moe.lava.banksia.core.room.dao.RouteDao
+import moe.lava.banksia.core.room.dao.StopDao
+import moe.lava.banksia.core.room.entity.asEntity
+import moe.lava.banksia.model.Stop
+
+internal class StopLocalDataSource(private val dao: StopDao, private val routeDao: RouteDao) {
+    suspend fun get(id: String) = dao.get(id)
+    suspend fun getByRoute(id: String) = routeDao.stops(id)
+    suspend fun save(vararg stops: Stop) = dao.insertOrReplaceAll(*stops.map { it.asEntity() }.toTypedArray())
+}

shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stop/StopRemoteDataSource.kt

@@ -0,0 +1,11 @@
+package moe.lava.banksia.core.data.sources.stop
+
+import io.ktor.client.HttpClient
+import io.ktor.client.call.body
+import io.ktor.client.request.get
+import moe.lava.banksia.model.Stop
+
+internal class StopRemoteDataSource(val client: HttpClient) {
+    suspend fun get(id: String) = client.get("stops/${id}").body<Stop>()
+    suspend fun getByRoute(id: String) = client.get("route_stops/${id}").body<List<Stop>>()
+}

shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stoptime/StopTimeLocalDataSource.kt

@@ -0,0 +1,28 @@
+package moe.lava.banksia.core.data.sources.stoptime
+
+import kotlinx.datetime.LocalDate
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.todayIn
+import moe.lava.banksia.core.room.dao.StopTimeDao
+import moe.lava.banksia.model.StopTimeDated
+import moe.lava.banksia.model.atDate
+import moe.lava.banksia.util.serialise
+import kotlin.time.Clock
+
+internal class StopTimeLocalDataSource(
+    private val stopTimeDao: StopTimeDao,
+) {
+    suspend fun getAtStop(
+        stopId: String,
+        date: LocalDate = Clock.System.todayIn(TimeZone.currentSystemDefault()),
+    ): List<StopTimeDated> {
+        return stopTimeDao
+            .getForStopDated(
+                stopId,
+                listOf(date.dayOfWeek).serialise(),
+                date.toEpochDays().toInt(),
+            )
+            .map { it.asModel().atDate(date) }
+            .sortedBy { it.departureTime }
+    }
+}

shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/stoptime/StopTimeRemoteDataSource.kt

@@ -0,0 +1,36 @@
+package moe.lava.banksia.core.data.sources.stoptime
+
+import io.ktor.client.HttpClient
+import io.ktor.client.call.body
+import io.ktor.client.request.get
+import io.ktor.client.request.parameter
+import kotlinx.datetime.LocalDate
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.todayIn
+import moe.lava.banksia.model.StopTimeDated
+import kotlin.time.Clock
+
+internal class StopTimeRemoteDataSource(
+    private val client: HttpClient,
+) {
+    suspend fun getAtStop(
+        stopId: String,
+        date: LocalDate? = Clock.System.todayIn(TimeZone.currentSystemDefault()),
+    ): List<StopTimeDated> {
+        return client.get("stoptimes/by_stop/${stopId}") {
+            parameter("date", date)
+        }.body<List<StopTimeDated>>()
+    }
+
+    /*suspend fun get(
+        stop: String? = null,
+        trip: String? = null,
+        day: DayOfWeek? = Clock.System.todayIn(TimeZone.currentSystemDefault()).dayOfWeek,
+    ): List<StopTime> {
+        return client.get("stoptimes") {
+            stop?.let { parameter("stop", it) }
+            trip?.let { parameter("trip", it) }
+            day?.let { parameter("day", it) }
+        }.body<List<StopTime>>()
+    }*/
+}

shared/data/src/commonMain/kotlin/moe/lava/banksia/core/data/sources/trip/TripRemoteDataSource.kt

@@ -0,0 +1,18 @@
+package moe.lava.banksia.core.data.sources.trip
+
+import io.ktor.client.HttpClient
+import kotlinx.datetime.DayOfWeek
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.todayIn
+import moe.lava.banksia.model.Trip
+import kotlin.time.Clock
+
+internal class TripRemoteDataSource(
+    private val client: HttpClient,
+) {
+    suspend fun get(
+        day: DayOfWeek? = Clock.System.todayIn(TimeZone.currentSystemDefault()).dayOfWeek,
+    ): List<Trip> {
+        return listOf()
+    }
+}

shared/room/build.gradle.kts

@@ -0,0 +1,54 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    alias(libs.plugins.kotlinMultiplatform)
+    alias(libs.plugins.kotlinSerialization)
+    alias(libs.plugins.androidMultiplatformLibrary)
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.room)
+}
+
+room {
+    schemaDirectory("$projectDir/schemas")
+}
+
+kotlin {
+    android {
+        namespace = "moe.lava.banksia.core.room"
+        compileSdk = libs.versions.android.compileSdk.get().toInt()
+
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
+        }
+    }
+
+    compilerOptions {
+        freeCompilerArgs.add("-opt-in=kotlin.time.ExperimentalTime")
+    }
+
+    iosArm64()
+    iosSimulatorArm64()
+
+    jvm()
+
+    sourceSets {
+        commonMain.dependencies {
+            implementation(libs.okio)
+            implementation(libs.koin.core)
+            implementation(libs.kotlinx.coroutines.core)
+            implementation(libs.kotlinx.datetime)
+            implementation(libs.kotlinx.serialization.json)
+            implementation(libs.room.runtime)
+            implementation(libs.sqlite.bundled)
+
+            implementation(projects.shared)
+        }
+    }
+}
+
+dependencies {
+    add("kspAndroid", libs.room.compiler)
+    add("kspIosArm64", libs.room.compiler)
+    add("kspIosSimulatorArm64", libs.room.compiler)
+    add("kspJvm", libs.room.compiler)
+}

shared/room/src/androidMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.android.kt

@@ -1,12 +1,10 @@
-package moe.lava.banksia.di
+package moe.lava.banksia.core.room
 
 import android.content.Context
 import androidx.room.Room
 import androidx.room.RoomDatabase
-import moe.lava.banksia.room.Database
 import org.koin.core.parameter.ParametersHolder
 import org.koin.core.scope.Scope
-import org.koin.dsl.module
 
 class AndroidDatabaseBuilder(val ctx: Context) : PlatformDatabaseBuilder {
     override fun getBuilder(): RoomDatabase.Builder<Database> {
@@ -19,7 +17,5 @@ class AndroidDatabaseBuilder(val ctx: Context) : PlatformDatabaseBuilder {
     }
 }
 
-actual fun Scope.provideDatabaseBuilder(p: ParametersHolder): PlatformDatabaseBuilder =
+internal actual fun Scope.provideDatabaseBuilder(p: ParametersHolder): PlatformDatabaseBuilder =
     AndroidDatabaseBuilder(get())
-
-internal actual val ExtPlatformModule = module { }

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/Database.kt

@@ -1,4 +1,4 @@
-package moe.lava.banksia.room
+package moe.lava.banksia.core.room
 
 import androidx.room.AutoMigration
 import androidx.room.RoomDatabase
@@ -10,23 +10,23 @@ import androidx.sqlite.driver.bundled.BundledSQLiteDriver
 import androidx.sqlite.execSQL
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
-import moe.lava.banksia.room.converter.RouteTypeConverter
-import moe.lava.banksia.room.dao.RouteDao
-import moe.lava.banksia.room.dao.ServiceDao
-import moe.lava.banksia.room.dao.ServiceExceptionDao
-import moe.lava.banksia.room.dao.ShapeDao
-import moe.lava.banksia.room.dao.StopDao
-import moe.lava.banksia.room.dao.StopTimeDao
-import moe.lava.banksia.room.dao.TripDao
-import moe.lava.banksia.room.dao.VersionMetadataDao
-import moe.lava.banksia.room.entity.RouteEntity
-import moe.lava.banksia.room.entity.ServiceEntity
-import moe.lava.banksia.room.entity.ServiceExceptionEntity
-import moe.lava.banksia.room.entity.ShapeEntity
-import moe.lava.banksia.room.entity.StopEntity
-import moe.lava.banksia.room.entity.StopTimeEntity
-import moe.lava.banksia.room.entity.TripEntity
-import moe.lava.banksia.room.entity.VersionMetadataEntity
+import moe.lava.banksia.core.room.converter.RouteTypeConverter
+import moe.lava.banksia.core.room.dao.RouteDao
+import moe.lava.banksia.core.room.dao.ServiceDao
+import moe.lava.banksia.core.room.dao.ServiceExceptionDao
+import moe.lava.banksia.core.room.dao.ShapeDao
+import moe.lava.banksia.core.room.dao.StopDao
+import moe.lava.banksia.core.room.dao.StopTimeDao
+import moe.lava.banksia.core.room.dao.TripDao
+import moe.lava.banksia.core.room.dao.VersionMetadataDao
+import moe.lava.banksia.core.room.entity.RouteEntity
+import moe.lava.banksia.core.room.entity.ServiceEntity
+import moe.lava.banksia.core.room.entity.ServiceExceptionEntity
+import moe.lava.banksia.core.room.entity.ShapeEntity
+import moe.lava.banksia.core.room.entity.StopEntity
+import moe.lava.banksia.core.room.entity.StopTimeEntity
+import moe.lava.banksia.core.room.entity.TripEntity
+import moe.lava.banksia.core.room.entity.VersionMetadataEntity
 import androidx.room.Database as DatabaseAnnotation
 
 @DatabaseAnnotation(

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.kt

@@ -1,12 +1,14 @@
-package moe.lava.banksia.di
+package moe.lava.banksia.core.room
 
-import moe.lava.banksia.room.Database
+import androidx.room.RoomDatabase
+import org.koin.core.parameter.ParametersHolder
+import org.koin.core.scope.Scope
 import org.koin.dsl.module
 
-val CommonModules = module {
-    includes(PlatformModule)
-
+val roomDiModule = module {
+    single { provideDatabaseBuilder(it) }
     single { Database.build(get<PlatformDatabaseBuilder>().getBuilder()) }
+
     single { get<Database>().versionMetadataDao }
     single { get<Database>().routeDao }
     single { get<Database>().serviceDao }
@@ -16,3 +18,9 @@ val CommonModules = module {
     single { get<Database>().stopTimeDao }
     single { get<Database>().tripDao }
 }
+
+internal interface PlatformDatabaseBuilder {
+    fun getBuilder(): RoomDatabase.Builder<Database>
+}
+
+internal expect fun Scope.provideDatabaseBuilder(p: ParametersHolder): PlatformDatabaseBuilder

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/converter/RouteTypeConverter.kt

@@ -1,4 +1,4 @@
-package moe.lava.banksia.room.converter
+package moe.lava.banksia.core.room.converter
 
 import androidx.room.TypeConverter
 import moe.lava.banksia.model.RouteType

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/converter/ShapePathConverter.kt

@@ -1,4 +1,4 @@
-package moe.lava.banksia.room.converter
+package moe.lava.banksia.core.room.converter
 
 import androidx.room.TypeConverter
 import moe.lava.banksia.model.ShapePath

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/RouteDao.kt

@@ -1,12 +1,12 @@
-package moe.lava.banksia.room.dao
+package moe.lava.banksia.core.room.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy.Companion.REPLACE
 import androidx.room.Query
-import moe.lava.banksia.room.entity.RouteEntity
-import moe.lava.banksia.room.entity.StopEntity
+import moe.lava.banksia.core.room.entity.RouteEntity
+import moe.lava.banksia.core.room.entity.StopEntity
 
 @Dao
 interface RouteDao {

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/ServiceDao.kt

@@ -1,11 +1,11 @@
-package moe.lava.banksia.room.dao
+package moe.lava.banksia.core.room.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy.Companion.REPLACE
 import androidx.room.Query
-import moe.lava.banksia.room.entity.ServiceEntity
+import moe.lava.banksia.core.room.entity.ServiceEntity
 
 @Dao
 interface ServiceDao {

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/ServiceExceptionDao.kt

@@ -1,11 +1,11 @@
-package moe.lava.banksia.room.dao
+package moe.lava.banksia.core.room.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy.Companion.REPLACE
 import androidx.room.Query
-import moe.lava.banksia.room.entity.ServiceExceptionEntity
+import moe.lava.banksia.core.room.entity.ServiceExceptionEntity
 
 @Dao
 interface ServiceExceptionDao {

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/ShapeDao.kt

@@ -1,11 +1,11 @@
-package moe.lava.banksia.room.dao
+package moe.lava.banksia.core.room.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy.Companion.REPLACE
 import androidx.room.Query
-import moe.lava.banksia.room.entity.ShapeEntity
+import moe.lava.banksia.core.room.entity.ShapeEntity
 
 @Dao
 interface ShapeDao {

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/StopDao.kt

@@ -1,11 +1,11 @@
-package moe.lava.banksia.room.dao
+package moe.lava.banksia.core.room.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy.Companion.REPLACE
 import androidx.room.Query
-import moe.lava.banksia.room.entity.StopEntity
+import moe.lava.banksia.core.room.entity.StopEntity
 
 @Dao
 interface StopDao {

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/StopTimeDao.kt

@@ -1,11 +1,11 @@
-package moe.lava.banksia.room.dao
+package moe.lava.banksia.core.room.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy.Companion.REPLACE
 import androidx.room.Query
-import moe.lava.banksia.room.entity.StopTimeEntity
+import moe.lava.banksia.core.room.entity.StopTimeEntity
 
 @Dao
 interface StopTimeDao {

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/TripDao.kt

@@ -1,11 +1,11 @@
-package moe.lava.banksia.room.dao
+package moe.lava.banksia.core.room.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy.Companion.REPLACE
 import androidx.room.Query
-import moe.lava.banksia.room.entity.TripEntity
+import moe.lava.banksia.core.room.entity.TripEntity
 
 @Dao
 interface TripDao {

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/dao/VersionMetadataDao.kt

@@ -1,10 +1,10 @@
-package moe.lava.banksia.room.dao
+package moe.lava.banksia.core.room.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy.Companion.REPLACE
 import androidx.room.Query
-import moe.lava.banksia.room.entity.VersionMetadataEntity
+import moe.lava.banksia.core.room.entity.VersionMetadataEntity
 
 @Dao
 interface VersionMetadataDao {

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/RouteEntity.kt

@@ -1,4 +1,4 @@
-package moe.lava.banksia.room.entity
+package moe.lava.banksia.core.room.entity
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ServiceEntity.kt

@@ -1,4 +1,4 @@
-package moe.lava.banksia.room.entity
+package moe.lava.banksia.core.room.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ServiceExceptionEntity.kt

@@ -1,4 +1,4 @@
-package moe.lava.banksia.room.entity
+package moe.lava.banksia.core.room.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/ShapeEntity.kt

@@ -1,11 +1,11 @@
-package moe.lava.banksia.room.entity
+package moe.lava.banksia.core.room.entity
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import androidx.room.TypeConverters
+import moe.lava.banksia.core.room.converter.ShapePathConverter
 import moe.lava.banksia.model.Shape
 import moe.lava.banksia.model.ShapePath
-import moe.lava.banksia.room.converter.ShapePathConverter
 
 @Entity("Shape")
 @TypeConverters(ShapePathConverter::class)

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/StopEntity.kt

@@ -1,4 +1,4 @@
-package moe.lava.banksia.room.entity
+package moe.lava.banksia.core.room.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/StopTimeEntity.kt

@@ -1,4 +1,4 @@
-package moe.lava.banksia.room.entity
+package moe.lava.banksia.core.room.entity
 
 import androidx.room.Entity
 import androidx.room.ForeignKey

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/TripEntity.kt

@@ -1,4 +1,4 @@
-package moe.lava.banksia.room.entity
+package moe.lava.banksia.core.room.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

shared/room/src/commonMain/kotlin/moe/lava/banksia/core/room/entity/VersionMetadataEntity.kt

@@ -1,4 +1,4 @@
-package moe.lava.banksia.room.entity
+package moe.lava.banksia.core.room.entity
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey

shared/room/src/iosMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.ios.kt

@@ -1,10 +1,8 @@
-package moe.lava.banksia.di
+package moe.lava.banksia.core.room
 
 import androidx.room.RoomDatabase
-import moe.lava.banksia.room.Database
 import org.koin.core.parameter.ParametersHolder
 import org.koin.core.scope.Scope
-import org.koin.dsl.module
 
 class IosDatabaseBuilder() : PlatformDatabaseBuilder {
     override fun getBuilder(): RoomDatabase.Builder<Database> {
@@ -12,7 +10,5 @@ class IosDatabaseBuilder() : PlatformDatabaseBuilder {
     }
 }
 
-actual fun Scope.provideDatabaseBuilder(p: ParametersHolder): PlatformDatabaseBuilder =
+internal actual fun Scope.provideDatabaseBuilder(p: ParametersHolder): PlatformDatabaseBuilder =
     IosDatabaseBuilder()
-
-internal actual val ExtPlatformModule = module {  }

shared/room/src/jvmMain/kotlin/moe/lava/banksia/core/room/RoomDiModule.jvm.kt

@@ -1,11 +1,9 @@
-package moe.lava.banksia.di
+package moe.lava.banksia.core.room
 
 import androidx.room.Room
 import androidx.room.RoomDatabase
-import moe.lava.banksia.room.Database
 import org.koin.core.parameter.ParametersHolder
 import org.koin.core.scope.Scope
-import org.koin.dsl.module
 import java.io.File
 
 class JvmDatabaseBuilder() : PlatformDatabaseBuilder {
@@ -17,7 +15,5 @@ class JvmDatabaseBuilder() : PlatformDatabaseBuilder {
     }
 }
 
-actual fun Scope.provideDatabaseBuilder(p: ParametersHolder): PlatformDatabaseBuilder =
+internal actual fun Scope.provideDatabaseBuilder(p: ParametersHolder): PlatformDatabaseBuilder =
     JvmDatabaseBuilder()
-
-internal actual val ExtPlatformModule = module {  }

shared/src/commonMain/kotlin/moe/lava/banksia/di/CoreDiModule.kt

@@ -0,0 +1,5 @@
+package moe.lava.banksia.di
+
+import org.koin.dsl.module
+
+val coreDiModule = module { }

shared/src/commonMain/kotlin/moe/lava/banksia/di/PlatformModule.kt

@@ -1,21 +0,0 @@
-package moe.lava.banksia.di
-
-import androidx.room.RoomDatabase
-import moe.lava.banksia.room.Database
-import org.koin.core.module.Module
-import org.koin.core.parameter.ParametersHolder
-import org.koin.core.scope.Scope
-import org.koin.dsl.module
-
-interface PlatformDatabaseBuilder {
-    fun getBuilder(): RoomDatabase.Builder<Database>
-}
-
-expect fun Scope.provideDatabaseBuilder(p: ParametersHolder): PlatformDatabaseBuilder
-
-internal expect val ExtPlatformModule: Module
-
-internal val PlatformModule = module {
-    includes(ExtPlatformModule)
-    single { provideDatabaseBuilder(it) }
-}