diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/NativeTargetsOptionType.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/NativeTargetsOptionType.kt index 84ae55292b6..96c3ef3052b 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/NativeTargetsOptionType.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/NativeTargetsOptionType.kt @@ -15,7 +15,7 @@ internal object NativeTargetsOptionType : OptionType>("targets val targets = targetNames.mapTo(HashSet()) { targetName -> predefinedTargets[targetName] ?: onError("Unknown hardware target: $targetName") - }.toList() + }.sortedBy { it.name } return Option(this, targets) } diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeTasks.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeTasks.kt index 7a9e869283e..53da24d0b7b 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeTasks.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeTasks.kt @@ -61,7 +61,7 @@ internal class NativeKlibCommonize(options: Collection>) : Task(option val konanTargets = outputCommonizerTarget.konanTargets val logger = CliLoggerAdapter(2) val libraryLoader = DefaultNativeLibraryLoader(logger) - val statsCollector = StatsCollector(statsType, outputCommonizerTarget.konanTargets.toList()) + val statsCollector = StatsCollector(statsType, konanTargets.toList()) val repository = FilesRepository(targetLibraries.toSet(), libraryLoader) val resultsConsumer = buildResultsConsumer { @@ -75,10 +75,10 @@ internal class NativeKlibCommonize(options: Collection>) : Task(option LibraryCommonizer( konanDistribution = distribution, repository = repository, - dependencies = KonanDistributionRepository(distribution, outputCommonizerTarget.konanTargets, libraryLoader) + + dependencies = KonanDistributionRepository(distribution, konanTargets, libraryLoader) + FilesRepository(dependencyLibraries.toSet(), libraryLoader), libraryLoader = libraryLoader, - targets = outputCommonizerTarget.konanTargets.toList(), + targets = konanTargets.toList(), resultsConsumer = resultsConsumer, statsCollector = statsCollector, logger = logger @@ -103,7 +103,7 @@ internal class NativeDistributionCommonize(options: Collection>) : Tas val logger = CliLoggerAdapter(2) val libraryLoader = DefaultNativeLibraryLoader(logger) val repository = KonanDistributionRepository(distribution, targets.toSet(), libraryLoader) - val statsCollector = StatsCollector(statsType, targets.toList()) + val statsCollector = StatsCollector(statsType, targets) val resultsConsumer = buildResultsConsumer { this add ModuleSerializer(destination, NativeDistributionCommonizerOutputLayout)