From 35008df9697d9d949e6f6176e3b4578c4237cb99 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Wed, 17 Feb 2021 09:34:00 +0100 Subject: [PATCH] [Commonizer] Rename NativeDistributionCommonizer to LibraryCommonizer --- .../kotlin/descriptors/commonizer/cli/nativeTasks.kt | 6 +++--- ...NativeDistributionCommonizer.kt => LibraryCommonizer.kt} | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/{NativeDistributionCommonizer.kt => LibraryCommonizer.kt} (96%) 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 4af1aef8a9f..7a9e869283e 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 @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.descriptors.commonizer.* import org.jetbrains.kotlin.descriptors.commonizer.konan.* import org.jetbrains.kotlin.descriptors.commonizer.konan.CopyUnconsumedModulesAsIsConsumer import org.jetbrains.kotlin.descriptors.commonizer.konan.CopyStdlibResultsConsumer -import org.jetbrains.kotlin.descriptors.commonizer.konan.NativeDistributionCommonizer +import org.jetbrains.kotlin.descriptors.commonizer.konan.LibraryCommonizer import org.jetbrains.kotlin.descriptors.commonizer.konan.ModuleSerializer import org.jetbrains.kotlin.descriptors.commonizer.repository.* import org.jetbrains.kotlin.descriptors.commonizer.repository.EmptyRepository @@ -72,7 +72,7 @@ internal class NativeKlibCommonize(options: Collection>) : Task(option this add LoggingResultsConsumer(outputCommonizerTarget, logger.toProgressLogger()) } - NativeDistributionCommonizer( + LibraryCommonizer( konanDistribution = distribution, repository = repository, dependencies = KonanDistributionRepository(distribution, outputCommonizerTarget.konanTargets, libraryLoader) + @@ -120,7 +120,7 @@ internal class NativeDistributionCommonize(options: Collection>) : Tas val description = "${logPrefix}Preparing commonized Kotlin/Native libraries for targets $targetNames$descriptionSuffix" println(description) - NativeDistributionCommonizer( + LibraryCommonizer( repository = repository, konanDistribution = distribution, dependencies = EmptyRepository, diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/LibraryCommonizer.kt similarity index 96% rename from native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/LibraryCommonizer.kt index df23088222e..b2e3e6a1ff2 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/LibraryCommonizer.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.descriptors.commonizer.konan import org.jetbrains.kotlin.descriptors.commonizer.* import org.jetbrains.kotlin.descriptors.commonizer.LeafCommonizerTarget import org.jetbrains.kotlin.descriptors.commonizer.cli.toProgressLogger -import org.jetbrains.kotlin.descriptors.commonizer.konan.NativeDistributionCommonizer.* +import org.jetbrains.kotlin.descriptors.commonizer.konan.LibraryCommonizer.* import org.jetbrains.kotlin.descriptors.commonizer.repository.Repository import org.jetbrains.kotlin.descriptors.commonizer.stats.StatsCollector import org.jetbrains.kotlin.descriptors.commonizer.utils.ResettableClockMark @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.util.Logger -internal class NativeDistributionCommonizer internal constructor( +internal class LibraryCommonizer internal constructor( private val konanDistribution: KonanDistribution, private val repository: Repository, private val dependencies: Repository,