From 78915028d367366fe3a37abefac00ca716d02306 Mon Sep 17 00:00:00 2001 From: lihenggui Date: Fri, 11 Oct 2024 18:34:34 -0700 Subject: [PATCH] Use koin in testing module --- core/testing/build.gradle.kts | 2 +- .../core/testing/di/TestDispatcherModule.kt | 11 +++----- .../core/testing/di/TestDispatchersModule.kt | 28 ------------------- 3 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt diff --git a/core/testing/build.gradle.kts b/core/testing/build.gradle.kts index 756959c83..c68f535fd 100644 --- a/core/testing/build.gradle.kts +++ b/core/testing/build.gradle.kts @@ -15,7 +15,7 @@ */ plugins { alias(libs.plugins.nowinandroid.kmp.library) - alias(libs.plugins.nowinandroid.kotlin.inject) + alias(libs.plugins.nowinandroid.di.koin) } android { diff --git a/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt index 40c1d45e7..04d24de59 100644 --- a/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt +++ b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt @@ -19,12 +19,9 @@ package com.google.samples.apps.nowinandroid.core.testing.di import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.TestDispatcher import kotlinx.coroutines.test.UnconfinedTestDispatcher -import me.tatarka.inject.annotations.Component -import me.tatarka.inject.annotations.Provides +import org.koin.dsl.module -@Component -internal abstract class TestDispatcherModule { - @OptIn(ExperimentalCoroutinesApi::class) - @Provides - fun providesTestDispatcher(): TestDispatcher = UnconfinedTestDispatcher() +@OptIn(ExperimentalCoroutinesApi::class) +val testDispatcherModule = module { + single { UnconfinedTestDispatcher() } } diff --git a/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt b/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt deleted file mode 100644 index 2f59d907f..000000000 --- a/core/testing/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.samples.apps.nowinandroid.core.testing.di - -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.test.TestDispatcher -import me.tatarka.inject.annotations.Component -import me.tatarka.inject.annotations.Provides - -@Component -internal abstract class TestDispatchersModule { - @Provides - fun providesDispatcher(testDispatcher: TestDispatcher): CoroutineDispatcher = testDispatcher -}