Merge pull request #38 from felipejoglar/felipejoglar/move-to-coroutines

Move to kotlinx coroutines

README.md

@@ -16,7 +16,7 @@
 ## License
 
 ```
-Copyright 2022-2023 Felipe Joglar
+Copyright 2022-2024 Felipe Joglar
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

apps/android/app/build.gradle.kts

@@ -101,7 +101,7 @@ dependencies {
     implementation(libs.precompose.viewmodel)
 
     testImplementation(libs.junit)
-    testImplementation(libs.coroutines.test)
+    testImplementation(libs.kotlinx.coroutines.test)
 
     debugImplementation(libs.androidx.compose.ui.tooling)
 }

apps/android/app/src/main/kotlin/com/taskodoro/android/app/navigation/AppNavigation.kt

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2023 Felipe Joglar
+ *    Copyright 2024 Felipe Joglar
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -27,8 +27,8 @@ import com.taskodoro.android.app.navigation.graphs.tasks.TASK_GRAPH_ROUTE
 import com.taskodoro.android.app.navigation.graphs.tasks.navigateToTaskGraph
 import com.taskodoro.android.app.navigation.graphs.tasks.taskGraph
 import com.taskodoro.android.app.navigation.transitions.forwardBackwardNavTransition
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import moe.tlaster.precompose.PreComposeApp
 import moe.tlaster.precompose.navigation.NavHost
 import moe.tlaster.precompose.navigation.NavOptions
@@ -46,8 +46,7 @@ fun AppNavigation(
         val navigator = rememberNavigator()
         val scope = rememberCoroutineScope()
 
-        val isOnboarded = onboardingStore.isOnboarded().getOrThrow()
-
+        val isOnboarded = runBlocking { onboardingStore.isOnboarded().getOrThrow() }
         val initialRoute = if (isOnboarded) TASK_GRAPH_ROUTE else ONBOARDING_GRAPH_ROUTE
 
         NavHost(
@@ -58,7 +57,7 @@ fun AppNavigation(
         ) {
             onboardingGraph(
                 onContinueClicked = {
-                    flowOf(onboardingStore.setOnboarded()).launchIn(scope)
+                    scope.launch { onboardingStore.setOnboarded() }
 
                     val options = NavOptions(popUpTo = PopUpTo.First())
                     navigator.navigateToTaskGraph(options)

apps/android/app/src/test/kotlin/com/taskodoro/android/app/tasks/new/TaskNewViewModelTest.kt

@@ -227,7 +227,7 @@ class TaskNewViewModelTest {
     private class TaskNewUseCaseStub : TaskNewUseCase {
         private var result: Result<Unit>? = null
 
-        override fun invoke(
+        override suspend fun invoke(
             title: String,
             description: String?,
             dueDate: Long?,

gradle/catalogs/libs.versions.toml

@@ -23,9 +23,9 @@ detektGradlePlugin = "1.23.1"
 
 desugar = "2.0.4"
 activity-compose = "1.8.2"
-androidx-activity =  "1.8.2"
-androidx-splashscreen =  "1.0.1"
-androidx-lifecycle =  "2.6.2"
+androidx-activity = "1.8.2"
+androidx-splashscreen = "1.0.1"
+androidx-lifecycle = "2.6.2"
 
 coil = "2.5.0"
 
@@ -35,12 +35,12 @@ compose-compiler = "1.5.7"
 
 precompose = "1.5.10"
 
-coroutines = "1.7.3"
 
 sqlDelight = "2.0.1"
 datastore = "1.1.0-alpha07"
 
 datetime = "0.4.1"
+coroutines = "1.7.3"
 
 junit = "4.13.2"
 
@@ -81,7 +81,10 @@ sqlDelight-jvm-driver = { module = "app.cash.sqldelight:sqlite-driver", version.
 datastore = { module = "androidx.datastore:datastore-preferences-core", version.ref = "datastore" }
 
 # kotlinx datetime - https://github.com/Kotlin/kotlinx-datetime
-kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime"}
+kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime" }
+
+# kotlinx coroutines - https://github.com/Kotlin/kotlinx.coroutines
+kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 
 # JUnit - https://junit.org/junit4/
 junit = { module = "junit:junit", version.ref = "junit" }
@@ -90,27 +93,27 @@ junit = { module = "junit:junit", version.ref = "junit" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" }
 
 # Coroutines - https://github.com/Kotlin/kotlinx.coroutines
-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
+kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 
 [plugins]
 # Android Gradle Plugin - https://developer.android.com/studio/releases/gradle-plugin
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
 
 # Kotlin Gradle Plugin - https://kotlinlang.org/docs/releases.html
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin"}
-kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin"}
-kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin"}
-kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin"}
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
+kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 
 # SQLDelight - https://cashapp.github.io/sqldelight/multiplatform_sqlite/
-sqlDelight = { id = "app.cash.sqldelight", version.ref = "sqlDelight"}
+sqlDelight = { id = "app.cash.sqldelight", version.ref = "sqlDelight" }
 
 # Spotless - https://github.com/diffplug/spotless
-spotless = { id = "com.diffplug.spotless", version.ref = "spotlessGradlePlugin"}
+spotless = { id = "com.diffplug.spotless", version.ref = "spotlessGradlePlugin" }
 
 # Detekt - https://detekt.dev/
-detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detektGradlePlugin"}
+detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detektGradlePlugin" }
 
 [bundles]
 androidx-compose = [

infra/preferences/build.gradle.kts

@@ -30,6 +30,7 @@ kotlin {
 
         commonMain.dependencies {
             implementation(libs.datastore)
+            implementation(libs.kotlinx.coroutines)
         }
 
     }

infra/preferences/src/commonMain/kotlin/com/taskodoro/storage/preferences/Preferences.kt

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2023 Felipe Joglar
+ *    Copyright 2024 Felipe Joglar
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -17,6 +17,6 @@
 package com.taskodoro.storage.preferences
 
 interface Preferences {
-    fun getBoolean(key: String): Boolean
-    fun setBoolean(key: String, value: Boolean)
+    suspend fun getBoolean(key: String): Boolean
+    suspend fun setBoolean(key: String, value: Boolean)
 }

infra/preferences/src/commonMain/kotlin/com/taskodoro/storage/preferences/datastore/DataStorePreferences.kt

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2023 Felipe Joglar
+ *    Copyright 2024 Felipe Joglar
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -20,20 +20,26 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
 import com.taskodoro.storage.preferences.Preferences
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.IO
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 
 internal class DataStorePreferences(
     private val dataStore: DataStore<androidx.datastore.preferences.core.Preferences>,
 ) : Preferences {
 
-    override fun getBoolean(key: String): Boolean = runBlocking {
-        return@runBlocking dataStore.data.first()[booleanPreferencesKey(key)] ?: false
+    override suspend fun getBoolean(key: String): Boolean {
+        return withContext(Dispatchers.IO) {
+            dataStore.data.first()[booleanPreferencesKey(key)] ?: false
+        }
     }
 
-    override fun setBoolean(key: String, value: Boolean): Unit = runBlocking {
-        dataStore.edit { preferences ->
-            preferences[booleanPreferencesKey(key)] = value
+    override suspend fun setBoolean(key: String, value: Boolean) {
+        withContext(Dispatchers.IO) {
+            dataStore.edit { preferences ->
+                preferences[booleanPreferencesKey(key)] = value
+            }
         }
     }
 }

infra/preferences/src/commonMain/kotlin/com/taskodoro/storage/preferences/test/TestPreferences.kt

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2023 Felipe Joglar
+ *    Copyright 2024 Felipe Joglar
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -38,11 +38,11 @@ class TestPreferences(
         }
     }
 
-    override fun getBoolean(key: String): Boolean {
+    override suspend fun getBoolean(key: String): Boolean {
         return dataStorePreferences.getBoolean(key)
     }
 
-    override fun setBoolean(key: String, value: Boolean) {
+    override suspend fun setBoolean(key: String, value: Boolean) {
         dataStorePreferences.setBoolean(key, value)
     }
 

settings.gradle.kts

@@ -35,7 +35,7 @@ dependencyResolutionManagement {
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
-rootProject.name = "Taskodoro_App"
+rootProject.name = "taskodoro-apps"
 
 include(":apps:android:app")
 include(":taskodoro")

taskodoro/build.gradle.kts

@@ -39,10 +39,12 @@ kotlin {
             implementation(projects.infra.database)
             implementation(projects.infra.preferences)
             implementation(libs.kotlinx.datetime)
+            implementation(libs.kotlinx.coroutines)
         }
 
         commonTest.dependencies {
             implementation(libs.kotlin.test)
+            implementation(libs.kotlinx.coroutines.test)
         }
     }
 

taskodoro/src/commonMain/kotlin/com/taskodoro/onboarding/data/PreferencesOnboardingStore.kt

@@ -27,13 +27,13 @@ internal class PreferencesOnboardingStore(
         private const val IS_ONBOARDED_KEY = "is_onboarded_key"
     }
 
-    override fun isOnboarded(): Result<Boolean> {
+    override suspend fun isOnboarded(): Result<Boolean> {
         return runCatching {
             preferences.getBoolean(IS_ONBOARDED_KEY)
         }
     }
 
-    override fun setOnboarded(): Result<Unit> {
+    override suspend fun setOnboarded(): Result<Unit> {
         return runCatching {
             preferences.setBoolean(IS_ONBOARDED_KEY, true)
         }

taskodoro/src/commonMain/kotlin/com/taskodoro/onboarding/feature/OnboardingStore.kt

@@ -17,6 +17,6 @@
 package com.taskodoro.onboarding.feature
 
 interface OnboardingStore {
-    fun isOnboarded(): Result<Boolean>
-    fun setOnboarded(): Result<Unit>
+    suspend fun isOnboarded(): Result<Boolean>
+    suspend fun setOnboarded(): Result<Unit>
 }

taskodoro/src/commonMain/kotlin/com/taskodoro/tasks/data/TaskRepository.kt

@@ -25,7 +25,7 @@ class TaskRepository(
 
     object SaveFailed : Exception()
 
-    override fun save(task: Task): Result<Unit> =
+    override suspend fun save(task: Task): Result<Unit> =
         try {
             store.save(task)
             Result.success(Unit)

taskodoro/src/commonMain/kotlin/com/taskodoro/tasks/data/TaskStore.kt

@@ -19,5 +19,5 @@ package com.taskodoro.tasks.data
 import com.taskodoro.tasks.feature.model.Task
 
 interface TaskStore {
-    fun save(task: Task)
+    suspend fun save(task: Task)
 }

taskodoro/src/commonMain/kotlin/com/taskodoro/tasks/data/local/SQLDelightTaskStore.kt

@@ -19,23 +19,28 @@ package com.taskodoro.tasks.data.local
 import com.taskodoro.storage.db.TaskodoroDB
 import com.taskodoro.tasks.data.TaskStore
 import com.taskodoro.tasks.feature.model.Task
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.IO
+import kotlinx.coroutines.withContext
 
 internal class SQLDelightTaskStore(
     database: TaskodoroDB,
 ) : TaskStore {
 
     internal val tasksQueries = database.localTaskQueries
 
-    override fun save(task: Task) {
-        tasksQueries.insert(
-            id = task.id.uuidString,
-            title = task.title,
-            description = task.description,
-            priority = task.priority.ordinal.toLong(),
-            completed = false,
-            dueDate = task.dueDate,
-            createdAt = task.createdAt,
-            updatedAt = 0,
-        )
+    override suspend fun save(task: Task) {
+        withContext(Dispatchers.IO) {
+            tasksQueries.insert(
+                id = task.id.uuidString,
+                title = task.title,
+                description = task.description,
+                priority = task.priority.ordinal.toLong(),
+                completed = false,
+                dueDate = task.dueDate,
+                createdAt = task.createdAt,
+                updatedAt = 0,
+            )
+        }
     }
 }

taskodoro/src/commonMain/kotlin/com/taskodoro/tasks/feature/TaskSaver.kt

@@ -19,5 +19,5 @@ package com.taskodoro.tasks.feature
 import com.taskodoro.tasks.feature.model.Task
 
 interface TaskSaver {
-    fun save(task: Task): Result<Unit>
+    suspend fun save(task: Task): Result<Unit>
 }

taskodoro/src/commonMain/kotlin/com/taskodoro/tasks/feature/new/TaskNewUseCase.kt

@@ -22,7 +22,7 @@ import com.taskodoro.tasks.validator.TaskValidatorError
 import com.taskodoro.tasks.validator.Validator
 
 interface TaskNewUseCase {
-    operator fun invoke(
+    suspend operator fun invoke(
         title: String,
         description: String? = null,
         dueDate: Long? = null,
@@ -35,7 +35,7 @@ class TaskNew(
     private val now: () -> Long,
 ) : TaskNewUseCase {
 
-    override operator fun invoke(
+    override suspend operator fun invoke(
         title: String,
         description: String?,
         dueDate: Long?,

taskodoro/src/commonTest/kotlin/com/taskodoro/onboarding/data/OnboardingStoreTest.kt

@@ -18,6 +18,7 @@ package com.taskodoro.onboarding.data
 
 import com.taskodoro.onboarding.feature.OnboardingStore
 import com.taskodoro.storage.preferences.test.TestPreferences
+import kotlinx.coroutines.test.runTest
 import kotlin.test.AfterTest
 import kotlin.test.Test
 import kotlin.test.assertFalse
@@ -26,14 +27,14 @@ import kotlin.test.assertTrue
 class OnboardingStoreTest {
 
     @Test
-    fun isOnboarded_returnsFalseWhenNotPreviouslySet() {
+    fun isOnboarded_returnsFalseWhenNotPreviouslySet() = runTest {
         val sut = makeSut()
 
         assertFalse(sut.isOnboarded().getOrThrow())
     }
 
     @Test
-    fun setOnboarded_setsValueCorrectly() {
+    fun setOnboarded_setsValueCorrectly() = runTest {
         val sut = makeSut()
 
         sut.setOnboarded()