(FEAT)[GH-80] Migrate data module to KMM

Author: Popalay

.github/detekt.yml

@@ -102,7 +102,7 @@ complexity:
     excludeStringsWithLessThan5Characters: true
     ignoreStringsRegex: '$^'
   TooManyFunctions:
-    active: true
+    active: false
     excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
     thresholdInFiles: 11
     thresholdInClasses: 11

.idea/jarRepositories.xml

@@ -1,12 +1,6 @@
 plugins {
     id("com.android.application")
     kotlin("android")
-    kotlin("kapt")
-}
-
-kapt {
-    correctErrorTypes = true
-    useBuildCache = true
 }
 
 val isCI = System.getenv("CI") == "true"
@@ -86,7 +80,8 @@ dependencies {
     implementation(Libs.kotlinStd)
     implementation(Libs.materialDesign)
     implementation(Libs.androidXCore)
-
+    implementation(Libs.Kotlinx.datetime)
+    implementation(Libs.Kotlinx.serialization)
     implementation(Libs.Compose.animation)
     implementation(Libs.Compose.foundation)
     implementation(Libs.Compose.foundationLayout)
@@ -114,10 +109,4 @@ dependencies {
 
     implementation(Libs.Koin.core)
     implementation(Libs.Koin.android)
-
-    implementation(Libs.Moshi.core)
-    implementation(Libs.Moshi.adapters)
-    implementation(Libs.Moshi.sealedAnnotations)
-    kapt(Libs.Moshi.codegen)
-    kapt(Libs.Moshi.sealedCodgen)
 }

app/build.gradle.kts

@@ -1,8 +1,6 @@
 package com.popalay.tracktor
 
 import com.popalay.tracktor.data.dataModule
-import com.popalay.tracktor.data.featureflags.FeatureFlagsManager
-import com.popalay.tracktor.data.featureflags.RealFeatureFlagsManager
 import com.popalay.tracktor.domain.domainModule
 import com.popalay.tracktor.feature.createtracker.CreateTrackerWorkflow
 import com.popalay.tracktor.feature.featureflagslist.FeatureFlagsListWorkflow
@@ -13,20 +11,15 @@ import org.koin.dsl.module
 
 val coreModule = module {
     single { AppWorkflow(get()) }
-    single { ListWorkflow(get(), get(), get(), get(), get(), get()) }
-    single { TrackerDetailWorkflow(get(), get(), get(), get()) }
-    single { FeatureFlagsListWorkflow(get()) }
-    single { CreateTrackerWorkflow(get(), get(), get()) }
+    single { ListWorkflow(get(), get(), get(), get(), get()) }
+    single { TrackerDetailWorkflow(get(), get(), get()) }
+    single { FeatureFlagsListWorkflow() }
+    single { CreateTrackerWorkflow(get(), get()) }
     single { SettingsWorkflow(get()) }
 }
 
-val featureFlagsModule = module {
-    single<FeatureFlagsManager> { RealFeatureFlagsManager() }
-}
-
 val modules = listOf(
     coreModule,
     domainModule,
     dataModule,
-    featureFlagsModule
 )

app/src/main/java/com/popalay/tracktor/Dependencies.kt

@@ -2,6 +2,7 @@ package com.popalay.tracktor.feature.createtracker
 
 import androidx.compose.ui.text.input.KeyboardType
 import com.popalay.tracktor.data.TrackingRepository
+import com.popalay.tracktor.data.extensions.now
 import com.popalay.tracktor.data.model.ProgressDirection
 import com.popalay.tracktor.data.model.ProgressDirection.ASCENDING
 import com.popalay.tracktor.data.model.TrackableUnit
@@ -11,24 +12,23 @@ import com.popalay.tracktor.domain.worker.GetAllUnitsWorker
 import com.popalay.tracktor.domain.worker.SaveTrackerWorker
 import com.popalay.tracktor.utils.toData
 import com.popalay.tracktor.utils.toSnapshot
-import com.squareup.moshi.JsonClass
-import com.squareup.moshi.Moshi
 import com.squareup.workflow.RenderContext
 import com.squareup.workflow.Snapshot
 import com.squareup.workflow.StatefulWorkflow
 import com.squareup.workflow.WorkflowAction
 import com.squareup.workflow.applyTo
-import java.time.LocalDateTime
+import kotlinx.datetime.LocalDateTime
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 import java.util.Locale
 import java.util.UUID
 
 class CreateTrackerWorkflow(
     private val trackingRepository: TrackingRepository,
-    private val getAllUnitsWorker: GetAllUnitsWorker,
-    private val moshi: Moshi
+    private val getAllUnitsWorker: GetAllUnitsWorker
 ) : StatefulWorkflow<Unit, CreateTrackerWorkflow.State, CreateTrackerWorkflow.Output, CreateTrackerWorkflow.Rendering>() {
 
-    @JsonClass(generateAdapter = true)
+    @Serializable
     data class State(
         val title: String = "",
         val selectedUnit: TrackableUnit = TrackableUnit.None,
@@ -155,7 +155,7 @@ class CreateTrackerWorkflow(
         val onAction: (Action) -> Unit
     )
 
-    override fun initialState(props: Unit, snapshot: Snapshot?): State = snapshot?.toData(moshi) ?: State()
+    override fun initialState(props: Unit, snapshot: Snapshot?): State = snapshot?.toData() ?: State()
 
     override fun render(
         props: Unit,
@@ -171,7 +171,7 @@ class CreateTrackerWorkflow(
         )
     }
 
-    override fun snapshotState(state: State): Snapshot = state.toSnapshot(moshi)
+    override fun snapshotState(state: State): Snapshot = state.toSnapshot()
 
     private fun runSideEffects(state: State, context: RenderContext<State, Output>) {
         if (state.currentAction is Action.SaveClicked) {

app/src/main/java/com/popalay/tracktor/feature/createtracker/CreateTrackerWorkflow.kt

@@ -1,16 +1,14 @@
 package com.popalay.tracktor.feature.featureflagslist
 
-import com.popalay.tracktor.data.featureflags.FeatureFlagsManager
 import com.popalay.tracktor.data.model.FeatureFlagListItem
 import com.popalay.tracktor.utils.updateItem
 import com.squareup.workflow.RenderContext
 import com.squareup.workflow.Snapshot
 import com.squareup.workflow.StatefulWorkflow
 import com.squareup.workflow.WorkflowAction
 
-class FeatureFlagsListWorkflow(
-    private val featureFlagsManager: FeatureFlagsManager
-) : StatefulWorkflow<Unit, FeatureFlagsListWorkflow.State, FeatureFlagsListWorkflow.Output, FeatureFlagsListWorkflow.Rendering>() {
+class FeatureFlagsListWorkflow :
+    StatefulWorkflow<Unit, FeatureFlagsListWorkflow.State, FeatureFlagsListWorkflow.Output, FeatureFlagsListWorkflow.Rendering>() {
 
     data class State(
         val featureFlags: List<FeatureFlagListItem> = emptyList()

app/src/main/java/com/popalay/tracktor/feature/featureflagslist/FeatureFlagsListWorkflow.kt

@@ -14,34 +14,31 @@ import com.popalay.tracktor.feature.settings.SettingsWorkflow
 import com.popalay.tracktor.feature.trackerdetail.TrackerDetailWorkflow
 import com.popalay.tracktor.utils.toData
 import com.popalay.tracktor.utils.toSnapshot
-import com.squareup.moshi.JsonClass
-import com.squareup.moshi.Moshi
 import com.squareup.workflow.RenderContext
 import com.squareup.workflow.Snapshot
 import com.squareup.workflow.StatefulWorkflow
 import com.squareup.workflow.Worker
 import com.squareup.workflow.WorkflowAction
 import com.squareup.workflow.applyTo
 import com.squareup.workflow.renderChild
-import dev.zacsweers.moshisealed.annotations.DefaultNull
-import dev.zacsweers.moshisealed.annotations.TypeLabel
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 import org.koin.core.KoinComponent
 
 class ListWorkflow(
     private val trackingRepository: TrackingRepository,
     private val getAllTrackersWorker: GetAllTrackersWorker,
     private val trackerDetailWorkflow: TrackerDetailWorkflow,
     private val createTrackerWorkflow: CreateTrackerWorkflow,
-    private val settingsWorkflow: SettingsWorkflow,
-    private val moshi: Moshi
+    private val settingsWorkflow: SettingsWorkflow
 ) : StatefulWorkflow<ListWorkflow.Props, ListWorkflow.State, ListWorkflow.Output, Any>(), KoinComponent {
     companion object {
         private const val DELETING_UNDO_TIMEOUT_MILLIS = 4000L
     }
 
     object Props
 
-    @JsonClass(generateAdapter = true)
+    @Serializable
     data class State(
         @Transient val items: List<TrackerListItem> = emptyList(),
         @Transient val filteredItems: List<TrackerListItem> = emptyList(),
@@ -56,20 +53,16 @@ class ListWorkflow(
         val animate: Boolean = true
     )
 
-    @DefaultNull
-    @JsonClass(generateAdapter = true, generator = "sealed:type")
+    @Serializable
     sealed class ChildState {
-        @TypeLabel("TrackerDetail")
-        @JsonClass(generateAdapter = true)
+        @Serializable
         data class TrackerDetail(val trackerId: String) : ChildState()
 
-        @TypeLabel("Settings")
-        @JsonClass(generateAdapter = true)
+        @Serializable
         @Suppress("CanSealedSubClassBeObject")
         class Settings : ChildState()
 
-        @TypeLabel("TrackerCreation")
-        @JsonClass(generateAdapter = true)
+        @Serializable
         @Suppress("CanSealedSubClassBeObject")
         class TrackerCreation : ChildState()
     }
@@ -163,7 +156,7 @@ class ListWorkflow(
             .let { if (it.isEmpty()) it else listOf(Category.All).plus(it) }
     }
 
-    override fun initialState(props: Props, snapshot: Snapshot?): State = snapshot?.toData(moshi) ?: State()
+    override fun initialState(props: Props, snapshot: Snapshot?): State = snapshot?.toData() ?: State()
 
     override fun render(
         props: Props,
@@ -194,7 +187,7 @@ class ListWorkflow(
         }
     }
 
-    override fun snapshotState(state: State): Snapshot = state.toSnapshot(moshi)
+    override fun snapshotState(state: State): Snapshot = state.toSnapshot()
 
     private fun runSideEffects(state: State, context: RenderContext<State, Output>) {
         when (val action = state.currentAction) {

app/src/main/java/com/popalay/tracktor/feature/list/ListWorkflow.kt

@@ -10,28 +10,27 @@ import com.popalay.tracktor.domain.worker.GetAllCategoriesWorker
 import com.popalay.tracktor.domain.worker.GetTrackerByIdWorker
 import com.popalay.tracktor.utils.toData
 import com.popalay.tracktor.utils.toSnapshot
-import com.squareup.moshi.JsonClass
-import com.squareup.moshi.Moshi
 import com.squareup.workflow.RenderContext
 import com.squareup.workflow.Snapshot
 import com.squareup.workflow.StatefulWorkflow
 import com.squareup.workflow.Worker
 import com.squareup.workflow.WorkflowAction
 import com.squareup.workflow.applyTo
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 
 class TrackerDetailWorkflow(
     private val trackingRepository: TrackingRepository,
     private val categoryRepository: CategoryRepository,
-    private val getAllCategoriesWorker: GetAllCategoriesWorker,
-    private val moshi: Moshi
+    private val getAllCategoriesWorker: GetAllCategoriesWorker
 ) : StatefulWorkflow<TrackerDetailWorkflow.Props, TrackerDetailWorkflow.State, TrackerDetailWorkflow.Output, TrackerDetailWorkflow.Rendering>() {
     companion object {
         private const val DELETING_UNDO_TIMEOUT_MILLIS = 2500L
     }
 
     data class Props(val trackerId: String)
 
-    @JsonClass(generateAdapter = true)
+    @Serializable
     data class State(
         val isAddRecordDialogShowing: Boolean = false,
         val isAddCategoryDialogShowing: Boolean = false,
@@ -95,7 +94,7 @@ class TrackerDetailWorkflow(
         val onAction: (Action) -> Unit
     )
 
-    override fun initialState(props: Props, snapshot: Snapshot?): State = snapshot?.toData(moshi) ?: State()
+    override fun initialState(props: Props, snapshot: Snapshot?): State = snapshot?.toData() ?: State()
 
     override fun render(
         props: Props,
@@ -112,7 +111,7 @@ class TrackerDetailWorkflow(
         )
     }
 
-    override fun snapshotState(state: State): Snapshot = state.toSnapshot(moshi)
+    override fun snapshotState(state: State): Snapshot = state.toSnapshot()
 
     private fun runSideEffects(state: State, context: RenderContext<State, Output>) {
         when (val action = state.currentAction) {

app/src/main/java/com/popalay/tracktor/feature/trackerdetail/TrackerDetailWorkflow.kt

@@ -11,7 +11,10 @@ plugins {
 allprojects {
     repositories {
         maven(url = "https://dl.bintray.com/kotlin/kotlin-eap/")
+        maven(url = "https://kotlin.bintray.com/kotlinx/")
         maven(url = "https://jitpack.io")
+        maven(url = "https://dl.bintray.com/ekito/koin")
+        mavenCentral()
         jcenter()
         google()
     }
@@ -36,8 +39,8 @@ subprojects {
     configurations.all {
         resolutionStrategy {
             force(
-                "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7",
-                "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7"
+                "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9",
+                "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9"
             )
         }
     }

build.gradle.kts

@@ -9,27 +9,20 @@ object AndroidConfig {
 object Version {
     const val androidGradlePlugin = "4.2.0-alpha10"
     const val kotlin = "1.4.10"
-    const val koin = "2.1.6"
-    const val moshi = "1.10.0"
-    const val moshiSealed = "0.2.0"
+    const val koin = "3.0.0-alpha-4"
     const val compose = "1.0.0-alpha02"
     const val workflow = "1.0.0-alpha.1"
     const val workflowCompose = "0.30.0"
-    const val room = "2.2.5"
     const val androidX = "1.5.0-alpha02"
+    const val sqlDelight = "1.4.3"
+    const val coroutines = "1.3.9"
 }
 
 object Libs {
     const val kotlinStd = "org.jetbrains.kotlin:kotlin-stdlib:${Version.kotlin}"
     const val materialDesign = "com.google.android.material:material:1.2.0"
-    const val preferenceKtx = "androidx.preference:preference-ktx:1.1.1"
     const val androidXCore = "androidx.core:core-ktx:${Version.androidX}"
-
-    object Room {
-        const val runtime = "androidx.room:room-runtime:${Version.room}"
-        const val ktx = "androidx.room:room-ktx:${Version.room}"
-        const val compiler = "androidx.room:room-compiler:${Version.room}"
-    }
+    const val uuid = "com.benasher44:uuid:0.2.2"
 
     object Compose {
         const val animation = "androidx.compose.animation:animation:${Version.compose}"
@@ -52,11 +45,17 @@ object Libs {
         const val android = "org.koin:koin-android:${Version.koin}"
     }
 
-    object Moshi {
-        const val core = "com.squareup.moshi:moshi:${Version.moshi}"
-        const val adapters = "com.squareup.moshi:moshi-adapters:${Version.moshi}"
-        const val codegen = "com.squareup.moshi:moshi-kotlin-codegen:${Version.moshi}"
-        const val sealedAnnotations = "dev.zacsweers.moshisealed:moshi-sealed-annotations:${Version.moshiSealed}"
-        const val sealedCodgen = "dev.zacsweers.moshisealed:moshi-sealed-codegen:${Version.moshiSealed}"
+    object SqlDelight {
+        const val runtime = "com.squareup.sqldelight:runtime:${Version.sqlDelight}"
+        const val android = "com.squareup.sqldelight:android-driver:${Version.sqlDelight}"
+        const val native = "com.squareup.sqldelight:native-driver:${Version.sqlDelight}"
+        const val coroutinesExtensions = "com.squareup.sqldelight:coroutines-extensions:${Version.sqlDelight}"
+    }
+
+    object Kotlinx {
+        const val datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.1.0"
+        const val serialization = "org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC"
+        const val coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Version.coroutines}"
+        const val coroutinesAndroid = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Version.coroutines}"
     }
 }