Skip to content

Commit 688cbbe

Browse files
sort content before generation
1 parent 52919aa commit 688cbbe

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ class ApplicationClassWriter(
3535
}
3636

3737
private fun writeConfigurationMap() {
38-
val configurationListString = application.configurations?.flatMap { configuration -> configuration.modules }?.distinct()?.let { generateIncludes(it) }
38+
val configurationListString = application.configurations?.flatMap { configuration -> configuration.modules }?.distinct()?.let { generateIncludes(it.sortedBy { it.packageName+""+it.className }) }
3939
writeln("$visibility val $extensionBase.configurationModules : List<Module> get() = listOf($configurationListString)")
4040
}
4141

4242
private fun writeKoinConfigurationField() {
43-
val moduleIncludes = application.moduleIncludes?.let { "+ listOf(${generateIncludes(it)})" } ?: ""
43+
val moduleIncludes = application.moduleIncludes?.let { "+ listOf(${generateIncludes(it.sortedBy { it.packageName+""+it.className })})" } ?: ""
4444
val configString = """
4545
$visibility fun $extensionBase.koinConfiguration(config : KoinAppDeclaration?=null) : KoinAppDeclaration = {
4646
includes(config)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,12 @@ abstract class ModuleWriter(
161161

162162
open fun writeModuleIncludes() {
163163
if (module.includes?.isNotEmpty() == true){
164-
writeln("${TAB}includes(${generateIncludes(module.includes)})")
164+
writeln("${TAB}includes(${generateIncludes(module.includes.sortedBy { it.packageName+""+it.className })})")
165165
}
166166
}
167167

168168
open fun writeDefinitions() {
169-
val (standardDefinitions, scopeDefinitions) = module.definitions.partition { it.isNotScoped() }
169+
val (standardDefinitions, scopeDefinitions) = module.definitions.sortedBy { it.packageName+""+it.label } .partition { it.isNotScoped() }
170170

171171
standardDefinitions.forEach { definitionFactory.writeDefinition(it, module) }
172172

@@ -207,7 +207,7 @@ abstract class ModuleWriter(
207207
private fun generateScopeFooter(): String = "${TAB}}"
208208

209209
open fun writeExternalDefinitionCalls() {
210-
if (module.externalDefinitions.isNotEmpty()){
210+
if (module.externalDefinitions.sortedBy { it.name } .isNotEmpty()){
211211
writeln(TAB+generateExternalDefinitionCalls())
212212
}
213213
}

0 commit comments

Comments
 (0)