azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Commonizer] Rename NativeDistributionCommonizer to LibraryCommonizer

Browse Source
This commit is contained in:
sebastian.sellmair
2021-02-17 09:34:00 +01:00
committed by Space
parent 4500b6ce74
commit 35008df969
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeTasks.kt
+3 -3
View File
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.descriptors.commonizer.*
import org.jetbrains.kotlin.descriptors.commonizer.konan.* import org.jetbrains.kotlin.descriptors.commonizer.konan.*
import org.jetbrains.kotlin.descriptors.commonizer.konan.CopyUnconsumedModulesAsIsConsumer import org.jetbrains.kotlin.descriptors.commonizer.konan.CopyUnconsumedModulesAsIsConsumer
import org.jetbrains.kotlin.descriptors.commonizer.konan.CopyStdlibResultsConsumer 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.konan.ModuleSerializer
import org.jetbrains.kotlin.descriptors.commonizer.repository.* import org.jetbrains.kotlin.descriptors.commonizer.repository.*
import org.jetbrains.kotlin.descriptors.commonizer.repository.EmptyRepository import org.jetbrains.kotlin.descriptors.commonizer.repository.EmptyRepository
@@ -72,7 +72,7 @@ internal class NativeKlibCommonize(options: Collection<Option<*>>) : Task(option
this add LoggingResultsConsumer(outputCommonizerTarget, logger.toProgressLogger()) this add LoggingResultsConsumer(outputCommonizerTarget, logger.toProgressLogger())
} }
NativeDistributionCommonizer( LibraryCommonizer(
konanDistribution = distribution, konanDistribution = distribution,
repository = repository, repository = repository,
dependencies = KonanDistributionRepository(distribution, outputCommonizerTarget.konanTargets, libraryLoader) + dependencies = KonanDistributionRepository(distribution, outputCommonizerTarget.konanTargets, libraryLoader) +
@@ -120,7 +120,7 @@ internal class NativeDistributionCommonize(options: Collection<Option<*>>) : Tas
val description = "${logPrefix}Preparing commonized Kotlin/Native libraries for targets $targetNames$descriptionSuffix" val description = "${logPrefix}Preparing commonized Kotlin/Native libraries for targets $targetNames$descriptionSuffix"
println(description) println(description)
NativeDistributionCommonizer( LibraryCommonizer(
repository = repository, repository = repository,
konanDistribution = distribution, konanDistribution = distribution,
dependencies = EmptyRepository, dependencies = EmptyRepository,
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt → native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/LibraryCommonizer.kt
+2 -2
View File
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.descriptors.commonizer.konan
import org.jetbrains.kotlin.descriptors.commonizer.* import org.jetbrains.kotlin.descriptors.commonizer.*
import org.jetbrains.kotlin.descriptors.commonizer.LeafCommonizerTarget import org.jetbrains.kotlin.descriptors.commonizer.LeafCommonizerTarget
import org.jetbrains.kotlin.descriptors.commonizer.cli.toProgressLogger 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.repository.Repository
import org.jetbrains.kotlin.descriptors.commonizer.stats.StatsCollector import org.jetbrains.kotlin.descriptors.commonizer.stats.StatsCollector
import org.jetbrains.kotlin.descriptors.commonizer.utils.ResettableClockMark 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.storage.LockBasedStorageManager
import org.jetbrains.kotlin.util.Logger import org.jetbrains.kotlin.util.Logger
internal class NativeDistributionCommonizer internal constructor( internal class LibraryCommonizer internal constructor(
private val konanDistribution: KonanDistribution, private val konanDistribution: KonanDistribution,
private val repository: Repository, private val repository: Repository,
private val dependencies: Repository, private val dependencies: Repository,