Merge pull request #318 from InsertKoinIO/fix-316_generation_content_stability

Fix 316 generation content stability

Author: arnaudgiuliani

example-cmp/gradle/libs.versions.toml

@@ -12,7 +12,7 @@ lifecycleCompose = "2.9.2"
 coil = "3.2.0"
 
 koin = "4.1.1"
-koin-annotations = "2.2.0"
+koin-annotations = "2.2.1-alpha-316"
 kotzilla = "1.2.2"
 ksp = "2.1.21-2.0.2"
 

examples/gradle/libs.versions.toml

@@ -5,7 +5,7 @@
 # Core
 kotlin = "2.1.21"
 koin = "4.1.0"
-koinAnnotations = "2.2.0"
+koinAnnotations = "2.2.1-alpha-316"
 ksp = "2.1.21-2.0.2"
 junit = "4.13.2"
 # Android

examples/other-ksp/src/main/kotlin/org/koin/example/qualifier/QualifierComponents.kt

@@ -37,5 +37,6 @@ public class QualifierModule {
     public fun anotherList(): StuffList = StuffList(listOf(Stuff("1"),Stuff("2")))
 
     @Single
+    @Named("another-counter")
     public fun anotherCounter(@Named("another-counter") stuffs: StuffList): StuffCounter = StuffCounter(stuffs.list,"another-counter")
 }

examples/other-ksp/src/test/kotlin/org.koin.example/TestModule.kt

@@ -113,7 +113,7 @@ class TestModule {
         assertEquals(ints,koin.get<MyInjectFactory>{ parametersOf(ints) }.ints)
 
         assertEquals(2,koin.get<StuffList>(named("another-counter")).list.size)
-        assertEquals("another-counter",koin.get<StuffCounter>().name)
+        assertEquals("another-counter",koin.get<StuffCounter>(named("another-counter")).name)
 
         assertNotNull(koin.getOrNull<MyType.MyChildType>())
 

projects/gradle.properties

@@ -7,7 +7,7 @@ org.gradle.parallel=true
 #Kotlin
 kotlin.code.style=official
 #Koin
-koinAnnotationsVersion=2.2.0
+koinAnnotationsVersion=2.2.1-alpha-316
 #Android
 android.useAndroidX=true
 androidMinSDK=14

projects/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/generator/ApplicationClassWriter.kt

@@ -35,12 +35,12 @@ class ApplicationClassWriter(
     }
 
     private fun writeConfigurationMap() {
-        val configurationListString = application.configurations?.flatMap { configuration -> configuration.modules }?.distinct()?.let { generateIncludes(it) }
+        val configurationListString = application.configurations?.flatMap { configuration -> configuration.modules }?.distinct()?.let { generateIncludes(it.sortedBy { it.packageName+"."+it.className }) }
         writeln("$visibility val $extensionBase.configurationModules : List<Module> get() = listOf($configurationListString)")
     }
 
     private fun writeKoinConfigurationField() {
-        val moduleIncludes = application.moduleIncludes?.let { "+ listOf(${generateIncludes(it)})" } ?: ""
+        val moduleIncludes = application.moduleIncludes?.let { "+ listOf(${generateIncludes(it.sortedBy { it.packageName+"."+it.className })})" } ?: ""
         val configString = """
             $visibility fun $extensionBase.koinConfiguration(config : KoinAppDeclaration?=null) : KoinAppDeclaration = {
                 includes(config)

projects/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/generator/ModuleWriter.kt

@@ -161,12 +161,12 @@ abstract class ModuleWriter(
 
     open fun writeModuleIncludes() {
         if (module.includes?.isNotEmpty() == true){
-            writeln("${TAB}includes(${generateIncludes(module.includes)})")
+            writeln("${TAB}includes(${generateIncludes(module.includes.sortedBy { it.packageName+"."+it.className })})")
         }
     }
 
     open fun writeDefinitions() {
-        val (standardDefinitions, scopeDefinitions) = module.definitions.partition { it.isNotScoped() }
+        val (standardDefinitions, scopeDefinitions) = module.definitions.sortedBy { it.packageName+""+it.label } .partition { it.isNotScoped() }
 
         standardDefinitions.forEach { definitionFactory.writeDefinition(it, module) }
 
@@ -207,7 +207,7 @@ abstract class ModuleWriter(
     private fun generateScopeFooter(): String = "${TAB}}"
 
     open fun writeExternalDefinitionCalls() {
-        if (module.externalDefinitions.isNotEmpty()){
+        if (module.externalDefinitions.sortedBy { it.name } .isNotEmpty()){
             writeln(TAB+generateExternalDefinitionCalls())
         }
     }