diff --git a/projects/android/koin-android/src/test/java/org/koin/test/android/ext/android/AndroidKoinScopeExtTest.kt b/projects/android/koin-android/src/test/java/org/koin/test/android/ext/android/AndroidKoinScopeExtTest.kt index fcb11e0a8..6496f22e4 100644 --- a/projects/android/koin-android/src/test/java/org/koin/test/android/ext/android/AndroidKoinScopeExtTest.kt +++ b/projects/android/koin-android/src/test/java/org/koin/test/android/ext/android/AndroidKoinScopeExtTest.kt @@ -16,7 +16,6 @@ import org.koin.test.android.helper.Helper.componentCallbacks import org.koin.test.android.helper.Helper.koinComponent import org.koin.test.android.helper.Helper.koinScopeComponent -@Suppress("OPT_IN_IS_NOT_ENABLED") @OptIn(KoinInternalApi::class) class AndroidKoinScopeExtTest : KoinTest { diff --git a/projects/compose/koin-androidx-compose-navigation/src/main/java/org/koin/androidx/compose/navigation/NavViewModel.kt b/projects/compose/koin-androidx-compose-navigation/src/main/java/org/koin/androidx/compose/navigation/NavViewModel.kt index 36f4606c4..51e22891f 100644 --- a/projects/compose/koin-androidx-compose-navigation/src/main/java/org/koin/androidx/compose/navigation/NavViewModel.kt +++ b/projects/compose/koin-androidx-compose-navigation/src/main/java/org/koin/androidx/compose/navigation/NavViewModel.kt @@ -13,16 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@file:Suppress("DeprecatedCallableAddReplaceWith") package org.koin.androidx.compose.navigation import androidx.compose.runtime.Composable -import androidx.lifecycle.* +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelStoreOwner import androidx.lifecycle.viewmodel.CreationExtras import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner import org.koin.androidx.viewmodel.resolveViewModel -import org.koin.compose.LocalKoinScope import org.koin.compose.currentKoinScope import org.koin.core.annotation.KoinInternalApi import org.koin.core.parameter.ParametersDefinition @@ -52,4 +51,4 @@ inline fun koinNavViewModel( return resolveViewModel( T::class, viewModelStoreOwner.viewModelStore, key, extras, qualifier, scope, parameters ) -} \ No newline at end of file +} diff --git a/projects/compose/koin-androidx-compose-navigation/src/main/java/org/koin/androidx/compose/navigation/NavViewModelInternals.kt b/projects/compose/koin-androidx-compose-navigation/src/main/java/org/koin/androidx/compose/navigation/NavViewModelInternals.kt index 14de23c60..a9668632e 100644 --- a/projects/compose/koin-androidx-compose-navigation/src/main/java/org/koin/androidx/compose/navigation/NavViewModelInternals.kt +++ b/projects/compose/koin-androidx-compose-navigation/src/main/java/org/koin/androidx/compose/navigation/NavViewModelInternals.kt @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@file:Suppress("DeprecatedCallableAddReplaceWith") package org.koin.androidx.compose.navigation @@ -39,4 +38,4 @@ fun defaultNavExtras(viewModelStoreOwner: ViewModelStoreOwner): CreationExtras = viewModelStoreOwner is NavBackStackEntry && viewModelStoreOwner.arguments != null -> viewModelStoreOwner.arguments?.toExtras(viewModelStoreOwner) ?: CreationExtras.Empty viewModelStoreOwner is HasDefaultViewModelProviderFactory -> viewModelStoreOwner.defaultViewModelCreationExtras else -> CreationExtras.Empty -} \ No newline at end of file +} diff --git a/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/GetExt.kt b/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/GetExt.kt index 7279ae836..fd69caac8 100644 --- a/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/GetExt.kt +++ b/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/GetExt.kt @@ -18,9 +18,7 @@ package org.koin.androidx.compose import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import org.koin.compose.currentKoinScope -import org.koin.compose.rememberCurrentKoinScope import org.koin.core.Koin -import org.koin.core.annotation.KoinInternalApi import org.koin.core.context.GlobalContext import org.koin.core.parameter.ParametersDefinition import org.koin.core.qualifier.Qualifier @@ -36,7 +34,6 @@ import org.koin.core.scope.Scope * @author Arnaud Giuliani * @author Henrique Horbovyi */ -@OptIn(KoinInternalApi::class) @Composable @Deprecated("use koinInject() instead") inline fun get( diff --git a/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/KoinAndroidContext.kt b/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/KoinAndroidContext.kt index 605fb70f0..a810c4919 100644 --- a/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/KoinAndroidContext.kt +++ b/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/KoinAndroidContext.kt @@ -14,8 +14,6 @@ * limitations under the License. */ -@file:OptIn(KoinInternalApi::class) - package org.koin.androidx.compose import android.app.Application @@ -28,7 +26,6 @@ import androidx.compose.ui.platform.LocalContext import org.koin.android.ext.android.getKoin import org.koin.compose.KoinContext import org.koin.core.annotation.KoinExperimentalAPI -import org.koin.core.annotation.KoinInternalApi import org.koin.core.component.KoinComponent import org.koin.mp.KoinPlatformTools @@ -52,7 +49,7 @@ import org.koin.mp.KoinPlatformTools @Composable @KoinExperimentalAPI fun KoinAndroidContext( - content: @Composable () -> Unit + content: @Composable () -> Unit, ) { val context = LocalContext.current val koinApplication = remember(context) { @@ -71,4 +68,4 @@ private fun Context.findContextForKoin(): ComponentCallbacks { context = context.baseContext } return applicationContext as Application -} \ No newline at end of file +} diff --git a/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/ViewModel.kt b/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/ViewModel.kt index efa0466e3..1d7f0ab85 100644 --- a/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/ViewModel.kt +++ b/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/ViewModel.kt @@ -13,16 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@file:Suppress("DeprecatedCallableAddReplaceWith") package org.koin.androidx.compose import androidx.compose.runtime.Composable -import androidx.lifecycle.* +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelStoreOwner import androidx.lifecycle.viewmodel.CreationExtras import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner import org.koin.androidx.viewmodel.resolveViewModel -import org.koin.compose.LocalKoinScope import org.koin.compose.currentKoinScope import org.koin.compose.rememberCurrentKoinScope import org.koin.core.annotation.KoinInternalApi @@ -69,4 +68,4 @@ inline fun koinViewModel( return resolveViewModel( T::class, viewModelStoreOwner.viewModelStore, key, extras, qualifier, scope, parameters ) -} \ No newline at end of file +} diff --git a/projects/compose/koin-compose-viewmodel/src/commonMain/kotlin/org/koin/compose/viewmodel/NavViewModel.kt b/projects/compose/koin-compose-viewmodel/src/commonMain/kotlin/org/koin/compose/viewmodel/NavViewModel.kt index 6e7aacdaf..7f2ba8a7f 100644 --- a/projects/compose/koin-compose-viewmodel/src/commonMain/kotlin/org/koin/compose/viewmodel/NavViewModel.kt +++ b/projects/compose/koin-compose-viewmodel/src/commonMain/kotlin/org/koin/compose/viewmodel/NavViewModel.kt @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@file:Suppress("DeprecatedCallableAddReplaceWith") package org.koin.compose.viewmodel import androidx.compose.runtime.Composable -import androidx.lifecycle.* +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelStoreOwner import androidx.lifecycle.viewmodel.CreationExtras import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner import org.koin.compose.currentKoinScope @@ -56,4 +56,4 @@ inline fun koinNavViewModel( return resolveViewModel( T::class, viewModelStoreOwner.viewModelStore, key, extras, qualifier, scope, parameters ) -} \ No newline at end of file +} diff --git a/projects/compose/koin-compose-viewmodel/src/commonMain/kotlin/org/koin/compose/viewmodel/NavViewModelInternals.kt b/projects/compose/koin-compose-viewmodel/src/commonMain/kotlin/org/koin/compose/viewmodel/NavViewModelInternals.kt index 5d7ecd518..e2cf25faf 100644 --- a/projects/compose/koin-compose-viewmodel/src/commonMain/kotlin/org/koin/compose/viewmodel/NavViewModelInternals.kt +++ b/projects/compose/koin-compose-viewmodel/src/commonMain/kotlin/org/koin/compose/viewmodel/NavViewModelInternals.kt @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@file:Suppress("DeprecatedCallableAddReplaceWith") package org.koin.compose.viewmodel @@ -59,4 +58,4 @@ fun Bundle.toExtras(viewModelStoreOwner: ViewModelStoreOwner): CreationExtras? { } }.getOrNull() } -} \ No newline at end of file +} diff --git a/projects/compose/koin-compose-viewmodel/src/commonMain/kotlin/org/koin/compose/viewmodel/ViewModel.kt b/projects/compose/koin-compose-viewmodel/src/commonMain/kotlin/org/koin/compose/viewmodel/ViewModel.kt index 03ba8c350..f7b4743a0 100644 --- a/projects/compose/koin-compose-viewmodel/src/commonMain/kotlin/org/koin/compose/viewmodel/ViewModel.kt +++ b/projects/compose/koin-compose-viewmodel/src/commonMain/kotlin/org/koin/compose/viewmodel/ViewModel.kt @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@file:Suppress("DeprecatedCallableAddReplaceWith") package org.koin.compose.viewmodel import androidx.compose.runtime.Composable -import androidx.lifecycle.* +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelStoreOwner import androidx.lifecycle.viewmodel.CreationExtras import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner import org.koin.compose.currentKoinScope @@ -57,4 +57,4 @@ inline fun koinViewModel( return resolveViewModel( T::class, viewModelStoreOwner.viewModelStore, key, extras, qualifier, scope, parameters ) -} \ No newline at end of file +} diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/instance/InstanceFactory.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/instance/InstanceFactory.kt index cd6deee73..7acb94da4 100644 --- a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/instance/InstanceFactory.kt +++ b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/instance/InstanceFactory.kt @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@file:Suppress("UNCHECKED_CAST") package org.koin.core.instance diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/FactoryOf.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/FactoryOf.kt index 20abc8833..9ad687f35 100644 --- a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/FactoryOf.kt +++ b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/FactoryOf.kt @@ -13,11 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@file:OptIn(KoinInternalApi::class) package org.koin.core.module.dsl -import org.koin.core.annotation.KoinInternalApi import org.koin.core.definition.KoinDefinition import org.koin.core.module.Module diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/ScopedFactoryOf.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/ScopedFactoryOf.kt index 56027200a..94c55d96c 100644 --- a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/ScopedFactoryOf.kt +++ b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/ScopedFactoryOf.kt @@ -13,11 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@file:OptIn(KoinInternalApi::class) package org.koin.core.module.dsl -import org.koin.core.annotation.KoinInternalApi import org.koin.core.definition.KoinDefinition import org.koin.dsl.ScopeDSL diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/ScopedOf.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/ScopedOf.kt index a957cb28b..5a652c547 100644 --- a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/ScopedOf.kt +++ b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/ScopedOf.kt @@ -13,13 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@file:OptIn(KoinInternalApi::class) package org.koin.core.module.dsl -import org.koin.core.annotation.KoinInternalApi import org.koin.core.definition.KoinDefinition -import org.koin.core.module.* import org.koin.dsl.ScopeDSL /** diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/SingleOf.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/SingleOf.kt index 4d7393f99..cd1ffa81b 100644 --- a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/SingleOf.kt +++ b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/module/dsl/SingleOf.kt @@ -13,11 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@file:OptIn(KoinInternalApi::class) package org.koin.core.module.dsl -import org.koin.core.annotation.KoinInternalApi import org.koin.core.definition.KoinDefinition import org.koin.core.module.Module diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/scope/Scope.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/scope/Scope.kt index 4127d04b1..5ddb2a5c2 100644 --- a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/scope/Scope.kt +++ b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/scope/Scope.kt @@ -214,7 +214,6 @@ class Scope( } } - @Suppress("UNCHECKED_CAST") private fun resolveInstance( qualifier: Qualifier?, clazz: KClass<*>, @@ -243,34 +242,34 @@ class Scope( qualifier: Qualifier?, clazz: KClass<*>, instanceContext: InstanceContext, - parameterDef: ParametersDefinition? + parameterDef: ParametersDefinition?, ) = ( _koin.instanceRegistry.resolveInstance(qualifier, clazz, this.scopeQualifier, instanceContext) - ?: run { - _koin.logger.debug("|- ? t:'${clazz.getFullName()}' - q:'$qualifier' look in injected parameters") - _parameterStackLocal.get()?.firstOrNull()?.getOrNull(clazz) - } - ?: run { - if (!isRoot){ - _koin.logger.debug("|- ? t:'${clazz.getFullName()}' - q:'$qualifier' look at scope source" ) - _source?.let { source -> - if (clazz.isInstance(source) && qualifier == null) { - _source as? T + ?: run { + _koin.logger.debug("|- ? t:'${clazz.getFullName()}' - q:'$qualifier' look in injected parameters") + _parameterStackLocal.get()?.firstOrNull()?.getOrNull(clazz) + } + ?: run { + if (!isRoot) { + _koin.logger.debug("|- ? t:'${clazz.getFullName()}' - q:'$qualifier' look at scope source") + _source?.let { source -> + if (clazz.isInstance(source) && qualifier == null) { + _source as? T + } else null + } } else null } - } else null - } - ?: run { - _koin.logger.debug("|- ? t:'${clazz.getFullName()}' - q:'$qualifier' look in other scopes" ) - findInOtherScope(clazz, qualifier, parameterDef) - } - ?: run { - if (parameterDef != null) { - _parameterStackLocal.remove() - _koin.logger.debug("|- << parameters") - } - throwDefinitionNotFound(qualifier, clazz) - }) + ?: run { + _koin.logger.debug("|- ? t:'${clazz.getFullName()}' - q:'$qualifier' look in other scopes") + findInOtherScope(clazz, qualifier, parameterDef) + } + ?: run { + if (parameterDef != null) { + _parameterStackLocal.remove() + _koin.logger.debug("|- << parameters") + } + throwDefinitionNotFound(qualifier, clazz) + }) @Suppress("UNCHECKED_CAST") private fun getFromSource(clazz: KClass<*>): T? { diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/dsl/ScopeDSL.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/dsl/ScopeDSL.kt index 9c62643a4..e783517a4 100644 --- a/projects/core/koin-core/src/commonMain/kotlin/org/koin/dsl/ScopeDSL.kt +++ b/projects/core/koin-core/src/commonMain/kotlin/org/koin/dsl/ScopeDSL.kt @@ -18,14 +18,15 @@ package org.koin.dsl import org.koin.core.annotation.KoinInternalApi import org.koin.core.definition.Definition import org.koin.core.definition.KoinDefinition -import org.koin.core.module.* +import org.koin.core.module.KoinDslMarker +import org.koin.core.module.Module +import org.koin.core.module._scopedInstanceFactory import org.koin.core.qualifier.Qualifier /** * DSL Scope Definition */ @OptIn(KoinInternalApi::class) -@Suppress("UNUSED_PARAMETER") @KoinDslMarker class ScopeDSL(val scopeQualifier: Qualifier, val module: Module) { diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/Components.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/Components.kt index 2764884e6..4e5e506cf 100644 --- a/projects/core/koin-core/src/commonTest/kotlin/org/koin/Components.kt +++ b/projects/core/koin-core/src/commonTest/kotlin/org/koin/Components.kt @@ -22,7 +22,6 @@ class Simple { class AllFactory2(val strings: MyStringFactory, val ints: MyIntFactory) } -@Suppress("unused") class Errors { class Boom { init { diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/core/ParametersInjectionTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/core/ParametersInjectionTest.kt index ca0b6ef7f..8936ddb4c 100644 --- a/projects/core/koin-core/src/commonTest/kotlin/org/koin/core/ParametersInjectionTest.kt +++ b/projects/core/koin-core/src/commonTest/kotlin/org/koin/core/ParametersInjectionTest.kt @@ -1,7 +1,6 @@ package org.koin.core import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll import kotlinx.coroutines.test.TestResult @@ -38,7 +37,6 @@ class ParametersInjectionTest { assertEquals(42, a.id) } - @OptIn(KoinInternalApi::class) @Test fun inject_param_get_or_null() { ensureCanInjectParam( @@ -355,10 +353,9 @@ class ParametersInjectionTest { } @Test - @OptIn(ExperimentalCoroutinesApi::class) fun `inject across multiple threads`(): TestResult { val times = 100 - + return runTest { val app = koinApplication { modules( diff --git a/projects/core/koin-test-junit4/src/test/kotlin/org/koin/test/DeclareMockTests.kt b/projects/core/koin-test-junit4/src/test/kotlin/org/koin/test/DeclareMockTests.kt index f0e1a8745..d23ccdf2b 100644 --- a/projects/core/koin-test-junit4/src/test/kotlin/org/koin/test/DeclareMockTests.kt +++ b/projects/core/koin-test-junit4/src/test/kotlin/org/koin/test/DeclareMockTests.kt @@ -13,7 +13,6 @@ import org.koin.test.mock.declareMock import org.mockito.BDDMockito.given import org.mockito.Mockito -@Suppress("UNCHECKED_CAST") class DeclareMockTests : AutoCloseKoinTest() { @get:Rule diff --git a/projects/core/koin-test-junit5/src/test/kotlin/org/koin/test/junit5/DeclareKoinContextFromExtensionTest.kt b/projects/core/koin-test-junit5/src/test/kotlin/org/koin/test/junit5/DeclareKoinContextFromExtensionTest.kt index f9e456413..fbff5f2b6 100644 --- a/projects/core/koin-test-junit5/src/test/kotlin/org/koin/test/junit5/DeclareKoinContextFromExtensionTest.kt +++ b/projects/core/koin-test-junit5/src/test/kotlin/org/koin/test/junit5/DeclareKoinContextFromExtensionTest.kt @@ -11,7 +11,6 @@ import org.koin.test.KoinTest import org.koin.test.Simple import org.koin.test.inject -@Suppress("UNCHECKED_CAST") class DeclareKoinContextFromExtensionTest : KoinTest { @JvmField diff --git a/projects/core/koin-test-junit5/src/test/kotlin/org/koin/test/junit5/DeclareMockTests.kt b/projects/core/koin-test-junit5/src/test/kotlin/org/koin/test/junit5/DeclareMockTests.kt index 94b709b44..3349d612c 100644 --- a/projects/core/koin-test-junit5/src/test/kotlin/org/koin/test/junit5/DeclareMockTests.kt +++ b/projects/core/koin-test-junit5/src/test/kotlin/org/koin/test/junit5/DeclareMockTests.kt @@ -14,7 +14,6 @@ import org.koin.test.mock.declareMock import org.mockito.BDDMockito.given import org.mockito.Mockito -@Suppress("UNCHECKED_CAST") class DeclareMockTests : AutoCloseKoinTest() { @JvmField diff --git a/projects/core/koin-test/src/jvmMain/kotlin/org/koin/test/verify/VerifyModule.kt b/projects/core/koin-test/src/jvmMain/kotlin/org/koin/test/verify/VerifyModule.kt index ba2d050b0..7d4c75538 100644 --- a/projects/core/koin-test/src/jvmMain/kotlin/org/koin/test/verify/VerifyModule.kt +++ b/projects/core/koin-test/src/jvmMain/kotlin/org/koin/test/verify/VerifyModule.kt @@ -1,7 +1,6 @@ package org.koin.test.verify import org.koin.core.annotation.KoinExperimentalAPI -import org.koin.core.annotation.KoinInternalApi import org.koin.core.module.Module import org.koin.core.time.Timer import kotlin.reflect.KClass @@ -31,7 +30,6 @@ fun List.verifyAll(extraTypes: List> = listOf()) { * * Help to check current factory of a Module */ -@OptIn(KoinInternalApi::class) @KoinExperimentalAPI object Verify { diff --git a/projects/ktor/koin-ktor/src/test/kotlin/org/koin/ktor/ext/KoinFeatureTest.kt b/projects/ktor/koin-ktor/src/test/kotlin/org/koin/ktor/ext/KoinFeatureTest.kt index 72b814fd4..a825a39f2 100644 --- a/projects/ktor/koin-ktor/src/test/kotlin/org/koin/ktor/ext/KoinFeatureTest.kt +++ b/projects/ktor/koin-ktor/src/test/kotlin/org/koin/ktor/ext/KoinFeatureTest.kt @@ -1,11 +1,11 @@ package org.koin.ktor.ext -import io.ktor.server.application.* -import io.ktor.server.testing.* +import io.ktor.server.application.install +import io.ktor.server.testing.withApplication import org.junit.After -import org.junit.Assert.* +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull import org.junit.Test -import org.koin.core.annotation.KoinReflectAPI import org.koin.core.context.stopKoin import org.koin.dsl.module import org.koin.ktor.plugin.Koin @@ -21,11 +21,10 @@ class Foo(val name: String = "") class Bar(val name: String = "") class Bar2(val name: String = "") -@OptIn(KoinReflectAPI::class) class KoinFeatureTest { @After - fun after(){ + fun after() { stopKoin() }