[WIP] # KMP support

app/src/main/java/com/rendox/routinetracker/app/RoutineTrackerApp.kt

@@ -26,9 +26,9 @@ class RoutineTrackerApp: Application() {
         startKoin {
             androidContext(this@RoutineTrackerApp)
             modules(
-                localDataSourceModule,
-                habitLocalDataModule,
-                completionTimeLocalDataModule,
+                com.rendox.routinetracker.core.database.di.localDataSourceModule,
+                com.rendox.routinetracker.core.database.di.habitLocalDataModule,
+                com.rendox.routinetracker.core.database.di.completionTimeLocalDataModule,
                 streakLocalDataModule,
 
                 routineDataModule,

build-logic/convention/build.gradle.kts

@@ -52,13 +52,25 @@ gradlePlugin {
             id = "routinetracker.jvm.library"
             implementationClass = "JvmLibraryConventionPlugin"
         }
+        register("kmpLibrary") {
+            id = "routinetracker.kmp.library"
+            implementationClass = "KmpLibraryConventionPlugin"
+        }
         register("androidKoin") {
             id = "routinetracker.android.koin"
             implementationClass = "AndroidKoinConventionPlugin"
         }
+        register("kmpKoin") {
+            id = "routinetracker.kmp.koin"
+            implementationClass = "KmpKoinConventionPlugin"
+        }
         register("instrumentationTestRunner") {
             id = "routinetracker.android.library.instrumentationtestrunner"
             implementationClass = "AndroidLibraryInstrumentationTestRunner"
         }
+        register("kmpInstrumentationTestRunner") {
+            id = "routinetracker.kmp.library.instrumentationtestrunner"
+            implementationClass = "KmpLibraryInstrumentationTestRunner"
+        }
     }
 }

build-logic/convention/src/main/java/KmpKoinConventionPlugin.kt

@@ -0,0 +1,19 @@
+import com.rendox.routinetracker.libs
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.dependencies
+
+class KmpKoinConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            dependencies {
+                val bom = libs.findLibrary("insert-koin-bom").get()
+
+                add("commonMainImplementation", platform(bom))
+                add("commonMainImplementation", "io.insert-koin:koin-core")
+                add("androidUnitTestImplementation", "io.insert-koin:koin-test")
+            }
+        }
+    }
+
+}

build-logic/convention/src/main/java/KmpLibraryConventionPlugin.kt

@@ -0,0 +1,43 @@
+import com.android.build.api.dsl.LibraryExtension
+import com.rendox.routinetracker.addAndroidTestDependencies
+import com.rendox.routinetracker.addLocalTestDependencies
+import com.rendox.routinetracker.configureBuildTypes
+import com.rendox.routinetracker.configureKotlinAndroid
+import com.rendox.routinetracker.configurePackaging
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+
+class KmpLibraryConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("org.jetbrains.kotlin.multiplatform")
+                apply("com.android.library")
+            }
+            extensions.configure<KotlinMultiplatformExtension> {
+                applyDefaultHierarchyTemplate()
+
+                androidTarget {
+                    compilerOptions {
+                        jvmTarget.set(JvmTarget.JVM_11)
+                    }
+                }
+                iosX64()
+                iosArm64()
+                iosSimulatorArm64()
+            }
+
+            extensions.configure<LibraryExtension> {
+                configureKotlinAndroid(this)
+                defaultConfig.targetSdk = 34
+                configureBuildTypes(this)
+                configurePackaging(this)
+                addLocalTestDependencies(this)
+                addAndroidTestDependencies(this)
+            }
+        }
+    }
+}

build-logic/convention/src/main/java/KmpLibraryInstrumentationTestRunner.kt

@@ -0,0 +1,27 @@
+import com.android.build.gradle.LibraryExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.project
+
+class KmpLibraryInstrumentationTestRunner : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("com.android.library")
+            }
+
+            extensions.configure<LibraryExtension> {
+                defaultConfig {
+                    testInstrumentationRunner =
+                        "com.rendox.routinetracker.core.testcommon.InstrumentationTestRunner"
+                }
+            }
+
+            dependencies {
+                add("androidUnitTestImplementation", project(":core:testcommon"))
+            }
+        }
+    }
+}

core/data/build.gradle.kts

@@ -1,7 +1,28 @@
 plugins {
-    id("routinetracker.android.library")
-    id("routinetracker.android.koin")
-    id("routinetracker.android.library.instrumentationtestrunner")
+    id("routinetracker.kmp.library")
+    id("routinetracker.kmp.koin")
+    id("routinetracker.kmp.library.instrumentationtestrunner")
+}
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation(project(":core:database"))
+                implementation(project(":core:model"))
+                implementation(project(":core:logic"))
+
+                implementation(libs.jetbrains.kotlinx.datetime)
+            }
+        }
+
+        androidInstrumentedTest {
+            dependencies {
+                implementation(project(":core:testcommon"))
+                implementation(libs.jetbrains.kotlinx.coroutines.test)
+            }
+        }
+    }
 }
 
 android {
@@ -25,15 +46,4 @@ android {
             }
         }
     }
-}
-
-dependencies {
-    implementation(project(":core:database"))
-    implementation(project(":core:model"))
-    implementation(project(":core:logic"))
-
-    implementation(libs.jetbrains.kotlinx.datetime)
-
-    androidTestImplementation(project(":core:testcommon"))
-    androidTestImplementation(libs.jetbrains.kotlinx.coroutines.test)
 }

core/data/src/main/java/com/rendox/routinetracker/core/data/completion_history/CompletionHistoryRepositoryImpl.kt → core/data/src/commonMain/kotlin/com/rendox/routinetracker/core/data/completion_history/CompletionHistoryRepositoryImpl.kt

@@ -5,7 +5,7 @@ import com.rendox.routinetracker.core.model.Habit
 import kotlinx.datetime.LocalDate
 
 class CompletionHistoryRepositoryImpl(
-    private val localDataSource: CompletionHistoryLocalDataSource
+    private val localDataSource: com.rendox.routinetracker.core.database.completion_history.CompletionHistoryLocalDataSource
 ): CompletionHistoryRepository {
     override suspend fun getNumOfTimesCompletedInPeriod(
         habitId: Long,

core/data/src/main/java/com/rendox/routinetracker/core/data/completion_time/CompletionTimeRepositoryImpl.kt → core/data/src/commonMain/kotlin/com/rendox/routinetracker/core/data/completion_time/CompletionTimeRepositoryImpl.kt

@@ -5,7 +5,7 @@ import kotlinx.datetime.LocalDate
 import kotlinx.datetime.LocalTime
 
 class CompletionTimeRepositoryImpl(
-    private val localDataSource: CompletionTimeLocalDataSource,
+    private val localDataSource: com.rendox.routinetracker.core.database.completion_time.CompletionTimeLocalDataSource,
 ) : CompletionTimeRepository {
 
     override suspend fun getCompletionTime(routineId: Long, date: LocalDate): LocalTime? {

core/data/src/main/java/com/rendox/routinetracker/core/data/completion_time/DueDateSpecificCompletionTimeRepositoryImpl.kt → core/data/src/commonMain/kotlin/com/rendox/routinetracker/core/data/completion_time/DueDateSpecificCompletionTimeRepositoryImpl.kt

@@ -4,7 +4,7 @@ import com.rendox.routinetracker.core.database.completion_time.DueDateSpecificCo
 import kotlinx.datetime.LocalTime
 
 class DueDateSpecificCompletionTimeRepositoryImpl(
-    private val localDataSource: DueDateSpecificCompletionTimeLocalDataSource
+    private val localDataSource: com.rendox.routinetracker.core.database.completion_time.DueDateSpecificCompletionTimeLocalDataSource
 ) : DueDateSpecificCompletionTimeRepository {
     override suspend fun getDueDateSpecificCompletionTime(
         scheduleId: Long, dueDateNumber: Int

core/data/src/main/java/com/rendox/routinetracker/core/data/di/CompletionHistoryDataModule.kt → core/data/src/commonMain/kotlin/com/rendox/routinetracker/core/data/di/CompletionHistoryDataModule.kt

@@ -8,8 +8,8 @@ import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
 val completionHistoryDataModule = module {
-    single<CompletionHistoryLocalDataSource> {
-        CompletionHistoryLocalDataSourceImpl(
+    single<com.rendox.routinetracker.core.database.completion_history.CompletionHistoryLocalDataSource> {
+        com.rendox.routinetracker.core.database.completion_history.CompletionHistoryLocalDataSourceImpl(
             db = get(),
             ioDispatcher = get(qualifier = named("ioDispatcher")),
         )

core/data/src/main/java/com/rendox/routinetracker/core/data/di/CompletionTimeDataModule.kt → core/data/src/commonMain/kotlin/com/rendox/routinetracker/core/data/di/CompletionTimeDataModule.kt

@@ -9,8 +9,8 @@ import org.koin.dsl.module
 
 val completionTimeDataModule = module {
 
-    single<CompletionTimeLocalDataSource> {
-        CompletionTimeLocalDataSourceImpl(
+    single<com.rendox.routinetracker.core.database.completion_time.CompletionTimeLocalDataSource> {
+        com.rendox.routinetracker.core.database.completion_time.CompletionTimeLocalDataSourceImpl(
             db = get(),
             ioDispatcher = get(qualifier = named("ioDispatcher")),
         )

core/database/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-    id("routinetracker.android.library")
-    id("routinetracker.android.koin")
-    id("routinetracker.android.library.instrumentationtestrunner")
+    id("routinetracker.kmp.library")
+    id("routinetracker.kmp.koin")
+    id("routinetracker.kmp.library.instrumentationtestrunner")
     alias(libs.plugins.app.cash.sqldelight)
 }
 
@@ -13,6 +13,47 @@ sqldelight {
     }
 }
 
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation(project(":core:logic"))
+                implementation(project(":core:model"))
+
+                implementation(libs.jetbrains.kotlinx.datetime)
+
+                implementation(libs.app.cash.sqldelight.coroutines.extensions)
+                implementation(libs.app.cash.sqldelight.primitive.adapters)
+            }
+        }
+
+        androidMain {
+            dependencies {
+                implementation(libs.app.cash.sqldelight.android.driver)
+                implementation(libs.app.cash.sqldelight.sqlite.driver)
+            }
+        }
+
+        androidUnitTest {
+            dependencies {
+                implementation(libs.jetbrains.kotlinx.coroutines.test)
+            }
+        }
+
+        androidInstrumentedTest {
+            dependencies {
+                implementation(libs.jetbrains.kotlinx.coroutines.test)
+            }
+        }
+
+        nativeMain {
+            dependencies {
+                implementation(libs.app.cash.sqldelight.native.driver)
+            }
+        }
+    }
+}
+
 android {
     namespace = "com.rendox.routinetracker.core.database"
 
@@ -34,19 +75,4 @@ android {
             }
         }
     }
-}
-
-dependencies {
-    implementation(project(":core:logic"))
-    implementation(project(":core:model"))
-
-    implementation(libs.jetbrains.kotlinx.datetime)
-
-    implementation(libs.app.cash.sqldelight.android.driver)
-    implementation(libs.app.cash.sqldelight.coroutines.extensions.jvm)
-    implementation(libs.app.cash.sqldelight.primitive.adapters)
-    implementation(libs.app.cash.sqldelight.sqlite.driver)
-
-    testImplementation(libs.jetbrains.kotlinx.coroutines.test)
-    androidTestImplementation(libs.jetbrains.kotlinx.coroutines.test)
 }

core/database/src/main/java/com/rendox/routinetracker/core/database/completion_history/CompletionHistoryLocalDataSourceImpl.kt → core/database/src/commonMain/kotlin/com/rendox/routinetracker/core/database/completion_history/CompletionHistoryLocalDataSourceImpl.kt

@@ -11,7 +11,7 @@ import kotlin.coroutines.CoroutineContext
 class CompletionHistoryLocalDataSourceImpl(
     private val db: RoutineTrackerDatabase,
     private val ioDispatcher: CoroutineContext,
-) : CompletionHistoryLocalDataSource {
+) : com.rendox.routinetracker.core.database.completion_history.CompletionHistoryLocalDataSource {
     override suspend fun getNumOfTimesCompletedInPeriod(
         habitId: Long,
         minDate: LocalDate?,

core/database/src/main/java/com/rendox/routinetracker/core/database/completion_time/CompletionTimeLocalDataSourceImpl.kt → core/database/src/commonMain/kotlin/com/rendox/routinetracker/core/database/completion_time/CompletionTimeLocalDataSourceImpl.kt

@@ -10,7 +10,7 @@ import kotlin.coroutines.CoroutineContext
 class CompletionTimeLocalDataSourceImpl(
     private val db: RoutineTrackerDatabase,
     private val ioDispatcher: CoroutineContext,
-) : CompletionTimeLocalDataSource {
+) : com.rendox.routinetracker.core.database.completion_time.CompletionTimeLocalDataSource {
 
     override suspend fun getCompletionTime(routineId: Long, date: LocalDate): LocalTime? {
         return withContext(ioDispatcher) {

core/database/src/main/java/com/rendox/routinetracker/core/database/completion_time/DueDateSpecificCompletionTimeLocalDataSourceImpl.kt → core/database/src/commonMain/kotlin/com/rendox/routinetracker/core/database/completion_time/DueDateSpecificCompletionTimeLocalDataSourceImpl.kt

@@ -9,7 +9,7 @@ import kotlin.coroutines.CoroutineContext
 class DueDateSpecificCompletionTimeLocalDataSourceImpl(
     private val db: RoutineTrackerDatabase,
     private val ioDispatcher: CoroutineContext,
-) : DueDateSpecificCompletionTimeLocalDataSource {
+) : com.rendox.routinetracker.core.database.completion_time.DueDateSpecificCompletionTimeLocalDataSource {
     override suspend fun getDueDateSpecificCompletionTime(
         scheduleId: Long, dueDateNumber: Int
     ): LocalTime? = withContext(ioDispatcher) {

core/database/src/main/java/com/rendox/routinetracker/core/database/di/CompletionTimeLocalDataModule.kt → core/database/src/commonMain/kotlin/com/rendox/routinetracker/core/database/di/CompletionTimeLocalDataModule.kt

@@ -6,8 +6,8 @@ import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
 val completionTimeLocalDataModule = module {
-    single<DueDateSpecificCompletionTimeLocalDataSource> {
-        DueDateSpecificCompletionTimeLocalDataSourceImpl(
+    single<com.rendox.routinetracker.core.database.completion_time.DueDateSpecificCompletionTimeLocalDataSource> {
+        com.rendox.routinetracker.core.database.completion_time.DueDateSpecificCompletionTimeLocalDataSourceImpl(
             db = get(),
             ioDispatcher = get(qualifier = named("ioDispatcher")),
         )

core/database/src/main/java/com/rendox/routinetracker/core/database/di/LocalDataSourceModule.kt → core/database/src/commonMain/kotlin/com/rendox/routinetracker/core/database/di/LocalDataSourceModule.kt

@@ -53,9 +53,9 @@ val localDataSourceModule = module {
             ),
             scheduleEntityAdapter = ScheduleEntity.Adapter(
                 typeAdapter = EnumColumnAdapter(),
-                startDateAdapter = localDateAdapter,
-                endDateAdapter = localDateAdapter,
-                startDayOfWeekInWeeklyScheduleAdapter = dayOfWeekAdapter,
+                startDateAdapter = com.rendox.routinetracker.core.database.di.localDateAdapter,
+                endDateAdapter = com.rendox.routinetracker.core.database.di.localDateAdapter,
+                startDayOfWeekInWeeklyScheduleAdapter = com.rendox.routinetracker.core.database.di.dayOfWeekAdapter,
                 numOfDueDaysInByNumOfDueDaysScheduleAdapter = IntColumnAdapter,
                 numOfDueDaysInFirstPeriodInByNumOfDueDaysScheduleAdapter = IntColumnAdapter,
                 numOfDaysInAlternateDaysScheduleAdapter = IntColumnAdapter,
@@ -70,25 +70,25 @@ val localDataSourceModule = module {
                 weekDayNumberMonthRelatedAdapter = EnumColumnAdapter(),
             ),
             specificDateCustomCompletionTimeAdapter = SpecificDateCustomCompletionTime.Adapter(
-                dateAdapter = localDateAdapter,
+                dateAdapter = com.rendox.routinetracker.core.database.di.localDateAdapter,
                 completionTimeHourAdapter = IntColumnAdapter,
                 completionTimeMinuteAdapter = IntColumnAdapter,
             ),
             completionHistoryEntityAdapter = CompletionHistoryEntity.Adapter(
-                dateAdapter = localDateAdapter,
+                dateAdapter = com.rendox.routinetracker.core.database.di.localDateAdapter,
                 numOfTimesCompletedAdapter = FloatColumnAdapter,
             ),
             vacationEntityAdapter = VacationEntity.Adapter(
-                startDateAdapter = localDateAdapter,
-                endDateAdapter = localDateAdapter,
+                startDateAdapter = com.rendox.routinetracker.core.database.di.localDateAdapter,
+                endDateAdapter = com.rendox.routinetracker.core.database.di.localDateAdapter,
             ),
             cashedStreakEntityAdapter = CashedStreakEntity.Adapter(
-                startDateAdapter = localDateAdapter,
-                endDateAdapter = localDateAdapter,
+                startDateAdapter = com.rendox.routinetracker.core.database.di.localDateAdapter,
+                endDateAdapter = com.rendox.routinetracker.core.database.di.localDateAdapter,
             ),
             streakCashedPeriodEntityAdapter = StreakCashedPeriodEntity.Adapter(
-                startDateAdapter = localDateAdapter,
-                endDateAdapter = localDateAdapter,
+                startDateAdapter = com.rendox.routinetracker.core.database.di.localDateAdapter,
+                endDateAdapter = com.rendox.routinetracker.core.database.di.localDateAdapter,
             ),
         )
     }