Merge branch '4.0.2' into 4.1.0

# Conflicts: # examples/gradle/versions.gradle # projects/gradle.properties
InsertKoinIO · Jan 9, 2025 · 04044bb · 04044bb
2 parents cd72dfc + 36865ef
commit 04044bb
Show file tree

Hide file tree

Showing 27 changed files with 56 additions and 50 deletions.
diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/registry/InstanceRegistry.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/registry/InstanceRegistry.kt
@@ -34,6 +34,7 @@ import org.koin.core.qualifier.Qualifier
 import org.koin.core.scope.Scope
 import org.koin.core.scope.ScopeID
 import org.koin.mp.KoinPlatformTools.safeHashMap
+import kotlin.collections.toTypedArray
 import kotlin.reflect.KClass
 
 @Suppress("UNCHECKED_CAST")
@@ -159,13 +160,13 @@ class InstanceRegistry(val _koin: Koin) {
     }
 
     internal fun dropScopeInstances(scope: Scope) {
-        _instances.values.filterIsInstance<ScopedInstanceFactory<*>>().forEach { factory -> factory.drop(scope) }
+        val factories = _instances.values.toTypedArray()
+        factories.filterIsInstance<ScopedInstanceFactory<*>>().forEach { factory -> factory.drop(scope) }
     }
 
     internal fun close() {
-        _instances.forEach { (_, factory) ->
-            factory.dropAll()
-        }
+        val factories = _instances.values.toTypedArray()
+        factories.forEach { factory -> factory.dropAll() }
         _instances.clear()
     }
 

diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/registry/ScopeRegistry.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/registry/ScopeRegistry.kt
@@ -90,7 +90,7 @@ class ScopeRegistry(private val _koin: Koin) {
     }
 
     private fun closeAllScopes() {
-        _scopes.values.toList().forEach { scope ->
+        _scopes.values.toTypedArray().forEach { scope ->
             scope.close()
         }
     }

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/core/OverrideAndCreateatStartTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/core/OverrideAndCreateatStartTest.kt
@@ -1,5 +1,6 @@
 package org.koin.core
 
+import org.koin.KoinCoreTest
 import org.koin.core.annotation.KoinInternalApi
 import org.koin.core.context.startKoin
 import org.koin.core.context.stopKoin
@@ -33,7 +34,7 @@ class SomeClassB : SomeClassInterface {
     }
 }
 
-class OverrideAndCreateatStartTest {
+class OverrideAndCreateatStartTest : KoinCoreTest(){
     val moduleA = module {
         single<SomeClassInterface>(createdAtStart = true) {
             SomeClassA()
@@ -46,11 +47,6 @@ class OverrideAndCreateatStartTest {
         }
     }
 
-    @AfterTest
-    fun after() {
-        stopKoin()
-    }
-
     @OptIn(KoinInternalApi::class)
     @Test
     fun testDefinitionOverride() {

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/AdditionalTypeBindingTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/AdditionalTypeBindingTest.kt
@@ -1,5 +1,6 @@
 package org.koin.dsl
 
+import org.koin.KoinCoreTest
 import org.koin.Simple
 import org.koin.core.logger.Level
 import org.koin.core.qualifier.named
@@ -9,7 +10,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 
 // TODO - Check flaky tests
-class AdditionalTypeBindingTest {
+class AdditionalTypeBindingTest : KoinCoreTest() {
 
 //    @Test
 //    fun `can resolve an additional type - bind`() {

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/CloseDefinitionTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/CloseDefinitionTest.kt
@@ -1,5 +1,6 @@
 package org.koin.dsl
 
+import org.koin.KoinCoreTest
 import org.koin.Simple
 import org.koin.core.context.startKoin
 import org.koin.core.context.stopKoin
@@ -9,7 +10,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
-class CloseDefinitionTest {
+class CloseDefinitionTest : KoinCoreTest() {
 
     @Test
     fun test_onClose() {

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/ConstructorDSLTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/ConstructorDSLTest.kt
@@ -1,5 +1,6 @@
 package org.koin.dsl
 
+import org.koin.KoinCoreTest
 import org.koin.core.logger.Level
 import org.koin.core.module.dsl.bind
 import org.koin.core.module.dsl.factoryOf
@@ -9,7 +10,7 @@ import kotlin.test.Test
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 
-class ConstructorDSLTest {
+class ConstructorDSLTest : KoinCoreTest() {
 
     @Test
     fun test_reified_type_constructor() {

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/CreateOnStart.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/CreateOnStart.kt
@@ -1,5 +1,6 @@
 package org.koin.dsl
 
+import org.koin.KoinCoreTest
 import org.koin.Simple
 import org.koin.core.component.KoinComponent
 import org.koin.core.context.startKoin
@@ -9,12 +10,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
-class CreateOnStart {
-
-    @AfterTest
-    fun after() {
-        stopKoin()
-    }
+class CreateOnStart : KoinCoreTest() {
 
     @Test
     fun `works with koin 2_2_3 and koin 3_0_2 breaks with koin 3_1_4`() {

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/FlattenTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/FlattenTest.kt
@@ -1,10 +1,11 @@
 package org.koin.dsl
 
+import org.koin.KoinCoreTest
 import org.koin.core.module.flatten
 import kotlin.test.Test
 import kotlin.test.assertTrue
 
-class FlattenTest {
+class FlattenTest : KoinCoreTest() {
 
     @Test
     fun test_simple_flatten() {

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/KoinAppCreationTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/KoinAppCreationTest.kt
@@ -1,5 +1,6 @@
 package org.koin.dsl
 
+import org.koin.KoinCoreTest
 import org.koin.Simple.ComponentA
 import org.koin.Simple.ComponentB
 import org.koin.core.annotation.KoinInternalApi
@@ -19,12 +20,7 @@ import kotlin.test.assertNotNull
 import kotlin.test.fail
 
 @OptIn(KoinInternalApi::class)
-class KoinAppCreationTest {
-
-    @AfterTest
-    fun after() {
-        stopKoin()
-    }
+class KoinAppCreationTest : KoinCoreTest() {
 
     @Test
     fun `make a Koin application`() {

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/ModuleAndPropertiesTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/ModuleAndPropertiesTest.kt
@@ -1,12 +1,13 @@
 package org.koin.dsl
 
+import org.koin.KoinCoreTest
 import org.koin.Simple
 import org.koin.core.error.InstanceCreationException
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.fail
 
-class ModuleAndPropertiesTest {
+class ModuleAndPropertiesTest : KoinCoreTest() {
 
     @Test
     fun `get a property from a module`() {

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/ModuleCreationTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/ModuleCreationTest.kt
@@ -1,12 +1,13 @@
 package org.koin.dsl
 
+import org.koin.KoinCoreTest
 import org.koin.Simple
 import org.koin.core.logger.Level
 import org.koin.test.assertDefinitionsCount
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-class ModuleCreationTest {
+class ModuleCreationTest : KoinCoreTest() {
 
     @Test
     fun `create an empty module`() {

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/ModuleDeclarationRulesTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/ModuleDeclarationRulesTest.kt
@@ -1,5 +1,6 @@
 package org.koin.dsl
 
+import org.koin.KoinCoreTest
 import org.koin.Simple
 import org.koin.core.error.DefinitionOverrideException
 import org.koin.core.logger.Level
@@ -8,7 +9,7 @@ import org.koin.test.assertDefinitionsCount
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-class ModuleDeclarationRulesTest {
+class ModuleDeclarationRulesTest : KoinCoreTest() {
 
     @Test
     fun `don't allow redeclaration`() {

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/ModuleFactoryIsolationTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/ModuleFactoryIsolationTest.kt
@@ -1,5 +1,6 @@
 package org.koin.dsl
 
+import org.koin.KoinCoreTest
 import org.koin.Simple
 import org.koin.core.annotation.KoinInternalApi
 import org.koin.core.module.Module
@@ -14,7 +15,7 @@ val myGetModule : Module get() = module { single { Simple.ComponentA() }  }
 fun myFunModule() = module { single { Simple.ComponentA() }  }
 
 @OptIn(KoinInternalApi::class)
-class ModuleFactoryIsolationTest {
+class ModuleFactoryIsolationTest : KoinCoreTest() {
 
     @Test
     fun testVariableIsolationAndInstanceFactories(){

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/ModuleIncludeTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/ModuleIncludeTest.kt
@@ -1,11 +1,12 @@
 package org.koin.dsl
 
+import org.koin.KoinCoreTest
 import org.koin.core.module.dsl.singleOf
 import org.koin.core.qualifier.named
 import kotlin.test.Test
 import kotlin.test.assertNotNull
 
-class ModuleIncludeTest {
+class ModuleIncludeTest : KoinCoreTest() {
 
     @Test
     fun test_include() {

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/ModuleRestartTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/ModuleRestartTest.kt
@@ -1,5 +1,6 @@
 package org.koin.dsl
 
+import org.koin.KoinCoreTest
 import org.koin.Simple
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
@@ -9,7 +10,7 @@ import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 
-class ModuleRestartTest : KoinComponent {
+class ModuleRestartTest : KoinComponent, KoinCoreTest() {
 
     @BeforeTest
     fun before() {
@@ -22,11 +23,6 @@ class ModuleRestartTest : KoinComponent {
         }
     }
 
-    @AfterTest
-    fun after() {
-        stopKoin()
-    }
-
     @Test
     fun first_test() {
         get<Simple.ComponentA>()

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/ModuleSpecialRulesTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/ModuleSpecialRulesTest.kt
@@ -1,10 +1,11 @@
 package org.koin.dsl
 
+import org.koin.KoinCoreTest
 import org.koin.core.qualifier.named
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-class ModuleSpecialRulesTest {
+class ModuleSpecialRulesTest : KoinCoreTest() {
 
     @Test
     fun `generic type declaration`() {

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/NamingTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/NamingTest.kt
@@ -1,12 +1,13 @@
 package org.koin.dsl
 
+import org.koin.KoinCoreTest
 import org.koin.Simple
 import org.koin.core.logger.Level
 import org.koin.core.qualifier.*
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-class NamingTest {
+class NamingTest : KoinCoreTest(){
 
     @Test
     fun `can resolve naming from root`() {

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/NewDSLTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/NewDSLTest.kt
@@ -2,6 +2,7 @@
 
 package org.koin.dsl
 
+import org.koin.KoinCoreTest
 import org.koin.core.annotation.KoinInternalApi
 import org.koin.core.instance.FactoryInstanceFactory
 import org.koin.core.instance.ScopedInstanceFactory
@@ -18,7 +19,7 @@ class ClassA2 : IClassA
 class ClassB(val a: IClassA)
 interface IClassA
 
-class NewDSLTest {
+class NewDSLTest : KoinCoreTest() {
 
     @Test
     fun singleof_options() {

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/PropertyDefinitionTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/dsl/PropertyDefinitionTest.kt
@@ -1,10 +1,11 @@
 package org.koin.dsl
 
+import org.koin.KoinCoreTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
 
-class PropertyDefinitionTest {
+class PropertyDefinitionTest : KoinCoreTest(){
 
     @Test
     fun `load and get properties`() {

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/full/TODOAppTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/full/TODOAppTest.kt
@@ -1,11 +1,12 @@
 package org.koin.full
 
+import org.koin.KoinCoreTest
 import org.koin.core.logger.Level
 import org.koin.dsl.koinApplication
 import org.koin.dsl.module
 import kotlin.test.*
 
-class TODOAppTest {
+class TODOAppTest : KoinCoreTest(){
 
     val defaultModule = module {
         single { TasksRepository(get()) }

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/koincomponent/AppTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/koincomponent/AppTest.kt
@@ -1,5 +1,6 @@
 package org.koin.koincomponent
 
+import org.koin.KoinCoreTest
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import org.koin.core.context.startKoin
@@ -16,7 +17,7 @@ class MyApp : KoinComponent {
     val presenter: TasksPresenter by inject()
 }
 
-class AppTest {
+class AppTest : KoinCoreTest(){
 
     @Test
     fun can_run_KoinComponent_app() {

diff --git a/...ts/core/koin-core/src/commonTest/kotlin/org/koin/koincomponent/CustomKoinComponentTest.kt b/...ts/core/koin-core/src/commonTest/kotlin/org/koin/koincomponent/CustomKoinComponentTest.kt
@@ -1,5 +1,6 @@
 package org.koin.koincomponent
 
+import org.koin.KoinCoreTest
 import org.koin.Simple
 import org.koin.core.Koin
 import org.koin.core.component.KoinComponent
@@ -31,7 +32,7 @@ class MyCustomApp : CustomKoinComponent() {
     val a: Simple.ComponentA by inject()
 }
 
-class CustomKoinComponentTest {
+class CustomKoinComponentTest : KoinCoreTest(){
 
     @Test
     fun can_inject_KoinComponent_from_custom_instance() {

diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/koincomponent/KoinComponentTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/koincomponent/KoinComponentTest.kt
@@ -1,5 +1,6 @@
 package org.koin.koincomponent
 
+import org.koin.KoinCoreTest
 import org.koin.Simple
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
@@ -20,7 +21,7 @@ class MyLazyComponent : KoinComponent {
     val anInject: Simple.ComponentA by inject()
 }
 
-class KoinComponentTest {
+class KoinComponentTest : KoinCoreTest(){
 
     @Test
     fun can_lazy_inject_from_KoinComponent() {