Kotlin 1.6.10, coroutines 1.6

app/build.gradle.kts

@@ -75,5 +75,6 @@ dependencies {
   androidTestImplementation(deps.test.androidXSspresso)
 
   addUnitTest()
+  testImplementation(testUtils)
   testImplementation(deps.koin.testJunit4)
 }

app/src/main/java/com/hoc/flowmvi/App.kt

@@ -47,7 +47,8 @@ class App : Application() {
     startKoin {
       androidContext(this@App)
 
-      androidLogger(if (BuildConfig.DEBUG) Level.DEBUG else Level.NONE)
+      // TODO(koin): https://github.com/InsertKoinIO/koin/issues/1188
+      androidLogger(if (BuildConfig.DEBUG) Level.ERROR else Level.NONE)
 
       modules(allModules)
     }

app/src/test/java/com/hoc/flowmvi/CheckModulesTest.kt

@@ -1,6 +1,7 @@
 package com.hoc.flowmvi
 
 import androidx.lifecycle.SavedStateHandle
+import com.hoc.flowmvi.test_utils.TestCoroutineDispatcherRule
 import io.mockk.every
 import io.mockk.mockkClass
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -27,12 +28,16 @@ class CheckModulesTest : AutoCloseKoinTest() {
       }
     }
   }
+  @get:Rule
+  val coroutineRule = TestCoroutineDispatcherRule()
 
   @Test
   fun verifyKoinApp() {
     koinApplication {
       modules(allModules)
-      printLogger(Level.DEBUG)
+
+      // TODO(koin): https://github.com/InsertKoinIO/koin/issues/1188
+      printLogger(Level.ERROR)
 
       checkModules {
         withInstance<SavedStateHandle>()

buildSrc/src/main/kotlin/deps.kt

@@ -7,7 +7,7 @@ import org.gradle.plugin.use.PluginDependenciesSpec
 import org.gradle.plugin.use.PluginDependencySpec
 
 const val ktlintVersion = "0.43.2"
-const val kotlinVersion = "1.5.31"
+const val kotlinVersion = "1.6.10"
 
 object appConfig {
   const val applicationId = "com.hoc.flowmvi"
@@ -52,7 +52,7 @@ object deps {
   }
 
   object coroutines {
-    private const val version = "1.5.2"
+    private const val version = "1.6.0"
 
     const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
     const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"

data/src/main/java/com/hoc/flowmvi/data/UserRepositoryImpl.kt

@@ -28,7 +28,7 @@ import kotlinx.coroutines.flow.scan
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.io.IOException
-import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.ExperimentalTime
 import arrow.core.Either.Companion.catch as catchEither
 
@@ -69,7 +69,7 @@ internal class UserRepositoryImpl(
     return withContext(dispatchers.io) {
       retrySuspend(
         times = 3,
-        initialDelay = Duration.milliseconds(500),
+        initialDelay = 500.milliseconds,
         factor = 2.0,
         shouldRetry = { it is IOException }
       ) { times ->

data/src/test/java/com/hoc/flowmvi/data/UserRepositoryImplRealAPITest.kt

@@ -13,6 +13,7 @@ import kotlinx.coroutines.runBlocking
 import org.junit.Rule
 import org.junit.rules.TestWatcher
 import org.junit.runner.Description
+import org.koin.core.logger.Level
 import org.koin.dsl.module
 import org.koin.test.KoinTest
 import org.koin.test.KoinTestRule
@@ -30,7 +31,8 @@ import kotlin.time.ExperimentalTime
 class UserRepositoryImplRealAPITest : KoinTest {
   @get:Rule
   val koinRuleTest = KoinTestRule.create {
-    printLogger()
+    // TODO(koin): https://github.com/InsertKoinIO/koin/issues/1188
+    printLogger(Level.ERROR)
     modules(
       dataModule,
       module {

data/src/test/java/com/hoc/flowmvi/data/UserRepositoryImplTest.kt

@@ -29,7 +29,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.test.runBlockingTest
+import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import java.io.IOException
 import kotlin.test.AfterTest
@@ -103,7 +103,6 @@ private val VALID_NEL_USERS = USERS.map(User::validNel)
 class UserRepositoryImplTest {
   @get:Rule
   val coroutineRule = TestCoroutineDispatcherRule()
-  private val testDispatcher get() = coroutineRule.testCoroutineDispatcher
 
   private lateinit var repo: UserRepositoryImpl
   private lateinit var userApiService: UserApiService
@@ -120,7 +119,7 @@ class UserRepositoryImplTest {
 
     repo = UserRepositoryImpl(
       userApiService = userApiService,
-      dispatchers = TestDispatchers(coroutineRule.testCoroutineDispatcher),
+      dispatchers = TestDispatchers(coroutineRule.testDispatcher),
       responseToDomain = responseToDomain,
       domainToBody = domainToBody,
       errorMapper = errorMapper
@@ -139,7 +138,7 @@ class UserRepositoryImplTest {
   }
 
   @Test
-  fun test_refresh_withApiCallSuccess_returnsRight() = testDispatcher.runBlockingTest {
+  fun test_refresh_withApiCallSuccess_returnsRight() = runTest {
     coEvery { userApiService.getUsers() } returns USER_RESPONSES
     every { responseToDomain(any()) } returnsMany VALID_NEL_USERS
 
@@ -157,7 +156,7 @@ class UserRepositoryImplTest {
   }
 
   @Test
-  fun test_refresh_withApiCallError_returnsLeft() = testDispatcher.runBlockingTest {
+  fun test_refresh_withApiCallError_returnsLeft() = runTest {
     val ioException = IOException()
     coEvery { userApiService.getUsers() } throws ioException
     every { errorMapper(ofType<IOException>()) } returns UserError.NetworkError
@@ -171,7 +170,7 @@ class UserRepositoryImplTest {
   }
 
   @Test
-  fun test_remove_withApiCallSuccess_returnsRight() = testDispatcher.runBlockingTest {
+  fun test_remove_withApiCallSuccess_returnsRight() = runTest {
     val user = USERS[0]
     val userResponse = USER_RESPONSES[0]
 
@@ -188,7 +187,7 @@ class UserRepositoryImplTest {
   }
 
   @Test
-  fun test_remove_withApiCallError_returnsLeft() = testDispatcher.runBlockingTest {
+  fun test_remove_withApiCallError_returnsLeft() = runTest {
     val user = USERS[0]
     coEvery { userApiService.remove(user.id) } throws IOException()
     every { errorMapper(ofType<IOException>()) } returns UserError.NetworkError
@@ -202,7 +201,7 @@ class UserRepositoryImplTest {
   }
 
   @Test
-  fun test_add_withApiCallSuccess_returnsRight() = testDispatcher.runBlockingTest {
+  fun test_add_withApiCallSuccess_returnsRight() = runTest {
     val user = USERS[0]
     val userResponse = USER_RESPONSES[0]
 
@@ -221,7 +220,7 @@ class UserRepositoryImplTest {
   }
 
   @Test
-  fun test_add_withApiCallError_returnsLeft() = testDispatcher.runBlockingTest {
+  fun test_add_withApiCallError_returnsLeft() = runTest {
     val user = USERS[0]
     coEvery { userApiService.add(USER_BODY) } throws IOException()
     every { domainToBody(user) } returns USER_BODY
@@ -238,7 +237,7 @@ class UserRepositoryImplTest {
   }
 
   @Test
-  fun test_search_withApiCallSuccess_returnsRight() = testDispatcher.runBlockingTest {
+  fun test_search_withApiCallSuccess_returnsRight() = runTest {
     val q = "hoc081098"
     coEvery { userApiService.search(q) } returns USER_RESPONSES
     every { responseToDomain(any()) } returnsMany VALID_NEL_USERS
@@ -258,7 +257,7 @@ class UserRepositoryImplTest {
   }
 
   @Test
-  fun test_search_withApiCallError_returnsLeft() = testDispatcher.runBlockingTest {
+  fun test_search_withApiCallError_returnsLeft() = runTest {
     val q = "hoc081098"
     coEvery { userApiService.search(q) } throws IOException()
     every { errorMapper(ofType<IOException>()) } returns UserError.NetworkError
@@ -273,7 +272,7 @@ class UserRepositoryImplTest {
   }
 
   @Test
-  fun test_getUsers_withApiCallSuccess_emitsInitial() = testDispatcher.runBlockingTest {
+  fun test_getUsers_withApiCallSuccess_emitsInitial() = runTest {
     coEvery { userApiService.getUsers() } returns USER_RESPONSES
     every { responseToDomain(any()) } returnsMany VALID_NEL_USERS
 
@@ -299,7 +298,7 @@ class UserRepositoryImplTest {
   }
 
   @Test
-  fun test_getUsers_withApiCallError_rethrows() = testDispatcher.runBlockingTest {
+  fun test_getUsers_withApiCallError_rethrows() = runTest {
     coEvery { userApiService.getUsers() } throws IOException()
     every { errorMapper(ofType<IOException>()) } returns UserError.NetworkError
 
@@ -322,7 +321,7 @@ class UserRepositoryImplTest {
 
   @Test
   fun test_getUsers_withApiCallSuccess_emitsInitialAndUpdatedUsers() =
-    testDispatcher.runBlockingTest {
+    runTest {
       val user = USERS.last()
       val userResponse = USER_RESPONSES.last()
       coEvery { userApiService.getUsers() } returns USER_RESPONSES.dropLast(1)

domain/src/test/java/com/hoc/flowmvi/domain/UseCaseTest.kt

@@ -22,7 +22,7 @@ import io.mockk.verify
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.test.runBlockingTest
+import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
@@ -57,7 +57,6 @@ private val USERS = listOf(
 class UseCaseTest {
   @get:Rule
   val coroutineRule = TestCoroutineDispatcherRule()
-  private val testDispatcher get() = coroutineRule.testCoroutineDispatcher
 
   private lateinit var userRepository: UserRepository
   private lateinit var getUsersUseCase: GetUsersUseCase
@@ -86,7 +85,7 @@ class UseCaseTest {
   }
 
   @Test
-  fun test_getUsersUseCase_whenSuccess_emitsUsers() = testDispatcher.runBlockingTest {
+  fun test_getUsersUseCase_whenSuccess_emitsUsers() = runTest {
     val usersRight = USERS.right()
     every { userRepository.getUsers() } returns flowOf(usersRight)
 
@@ -97,7 +96,7 @@ class UseCaseTest {
   }
 
   @Test
-  fun test_getUsersUseCase_whenError_throwsError() = testDispatcher.runBlockingTest {
+  fun test_getUsersUseCase_whenError_throwsError() = runTest {
     every { userRepository.getUsers() } returns flowOf(errorLeft)
 
     val result = getUsersUseCase()
@@ -107,7 +106,7 @@ class UseCaseTest {
   }
 
   @Test
-  fun test_refreshUseCase_whenSuccess_returnsUnit() = testDispatcher.runBlockingTest {
+  fun test_refreshUseCase_whenSuccess_returnsUnit() = runTest {
     coEvery { userRepository.refresh() } returns Unit.right()
 
     val result = refreshUseCase()
@@ -117,7 +116,7 @@ class UseCaseTest {
   }
 
   @Test
-  fun test_refreshUseCase_whenError_throwsError() = testDispatcher.runBlockingTest {
+  fun test_refreshUseCase_whenError_throwsError() = runTest {
     coEvery { userRepository.refresh() } returns errorLeft
 
     val result = refreshUseCase()
@@ -127,7 +126,7 @@ class UseCaseTest {
   }
 
   @Test
-  fun test_removeUserUseCase_whenSuccess_returnsUnit() = testDispatcher.runBlockingTest {
+  fun test_removeUserUseCase_whenSuccess_returnsUnit() = runTest {
     coEvery { userRepository.remove(any()) } returns Unit.right()
 
     val result = removeUserUseCase(USERS[0])
@@ -137,7 +136,7 @@ class UseCaseTest {
   }
 
   @Test
-  fun test_removeUserUseCase_whenError_throwsError() = testDispatcher.runBlockingTest {
+  fun test_removeUserUseCase_whenError_throwsError() = runTest {
     coEvery { userRepository.remove(any()) } returns errorLeft
 
     val result = removeUserUseCase(USERS[0])
@@ -147,7 +146,7 @@ class UseCaseTest {
   }
 
   @Test
-  fun test_addUserUseCase_whenSuccess_returnsUnit() = testDispatcher.runBlockingTest {
+  fun test_addUserUseCase_whenSuccess_returnsUnit() = runTest {
     coEvery { userRepository.add(any()) } returns Unit.right()
 
     val result = addUserUseCase(USERS[0])
@@ -157,7 +156,7 @@ class UseCaseTest {
   }
 
   @Test
-  fun test_addUserUseCase_whenError_throwsError() = testDispatcher.runBlockingTest {
+  fun test_addUserUseCase_whenError_throwsError() = runTest {
     coEvery { userRepository.add(any()) } returns errorLeft
 
     val result = addUserUseCase(USERS[0])
@@ -167,7 +166,7 @@ class UseCaseTest {
   }
 
   @Test
-  fun test_searchUsersUseCase_whenSuccess_returnsUsers() = testDispatcher.runBlockingTest {
+  fun test_searchUsersUseCase_whenSuccess_returnsUsers() = runTest {
     coEvery { userRepository.search(any()) } returns USERS.right()
 
     val query = "hoc081098"
@@ -178,7 +177,7 @@ class UseCaseTest {
   }
 
   @Test
-  fun test_searchUsersUseCase_whenError_throwsError() = testDispatcher.runBlockingTest {
+  fun test_searchUsersUseCase_whenError_throwsError() = runTest {
     coEvery { userRepository.search(any()) } returns errorLeft
 
     val query = "hoc081098"