diff --git a/gradle-module-plugin/src/main/kotlin/io/ia/sdk/gradle/modl/task/WriteModuleXml.kt b/gradle-module-plugin/src/main/kotlin/io/ia/sdk/gradle/modl/task/WriteModuleXml.kt index 6c1a21f..875344c 100644 --- a/gradle-module-plugin/src/main/kotlin/io/ia/sdk/gradle/modl/task/WriteModuleXml.kt +++ b/gradle-module-plugin/src/main/kotlin/io/ia/sdk/gradle/modl/task/WriteModuleXml.kt @@ -223,17 +223,15 @@ open class WriteModuleXml @Inject constructor(_objects: ObjectFactory) : Default .flatMap { mani -> mani.artifacts } .groupBy { arti -> arti.jarName } .map { (jar, artifacts) -> - Pair( - jar, - // Combine all scopes for the artifact - artifacts.fold(setOf()) { scope, arti -> - scope.union( - manifests - .filter { mani -> arti in mani.artifacts } - .flatMap { mani -> mani.scope.toList() } - ) - }.joinToString("") - ) + val combinedScope = artifacts.fold(setOf()) { scope, arti -> + scope.union( + manifests + .filter { mani -> arti in mani.artifacts } + .flatMap { mani -> mani.scope.toList() } + ) + }.joinToString("") + + jar to combinedScope }.sortedWith( compareByDescending> { (_, scope) -> scope.length } .thenBy { (_, scope) -> scope }