Minor: rename KotlinCompilation.sourceSets -> allSourceSets
This commit is contained in:
Dmitry Savvinov
committed by
Yaroslav Chernyshev
Yaroslav Chernyshev
parent
1143865e88
commit
4927777ffb
+11
-11
@@ -289,7 +289,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtensionComp
|
||||
val path = toCanonicalPath(target.jar!!.archiveFile!!.absolutePath)
|
||||
val currentModules = userData[path] ?: ArrayList<String>().apply { userData[path] = this }
|
||||
// Test modules should not be added. Otherwise we could get dependnecy of java.mail on jvmTest
|
||||
val allSourceSets = target.compilations.filter { !it.isTestModule }.flatMap { it.sourceSets }.toSet()
|
||||
val allSourceSets = target.compilations.filter { !it.isTestModule }.flatMap { it.allSourceSets }.toSet()
|
||||
val availableViaDependsOn = allSourceSets.flatMap { it.dependsOnSourceSets }.mapNotNull { mppModel.sourceSets[it] }
|
||||
allSourceSets.union(availableViaDependsOn).forEach { sourceSet ->
|
||||
currentModules.add(getKotlinModuleId(gradleModule, sourceSet, resolverCtx))
|
||||
@@ -362,7 +362,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtensionComp
|
||||
resolverCtx
|
||||
) ?: continue
|
||||
kotlinSourceSet.externalSystemRunTasks =
|
||||
compilation.sourceSets.firstNotNullResult { sourceSetToRunTasks[it] } ?: emptyList()
|
||||
compilation.allSourceSets.firstNotNullResult { sourceSetToRunTasks[it] } ?: emptyList()
|
||||
|
||||
if (compilation.platform == KotlinPlatform.JVM || compilation.platform == KotlinPlatform.ANDROID) {
|
||||
compilationData.targetCompatibility = (kotlinSourceSet.compilerArguments as? K2JVMCompilerArguments)?.jvmTarget
|
||||
@@ -374,7 +374,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtensionComp
|
||||
}
|
||||
}
|
||||
|
||||
for (sourceSet in compilation.sourceSets) {
|
||||
for (sourceSet in compilation.allSourceSets) {
|
||||
sourceSetToCompilationData.getOrPut(sourceSet.name) { LinkedHashSet() } += compilationData
|
||||
for (dependentSourceSetName in sourceSet.dependsOnSourceSets) {
|
||||
sourceSetToCompilationData.getOrPut(dependentSourceSetName) { LinkedHashSet() } += compilationData
|
||||
@@ -495,7 +495,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtensionComp
|
||||
)
|
||||
}
|
||||
val allRunTasks = testRunTasks + nativeMainRunTasks
|
||||
compilation.sourceSets.forEach { sourceSet ->
|
||||
compilation.allSourceSets.forEach { sourceSet ->
|
||||
sourceSetToRunTasks.getOrPut(sourceSet) { LinkedHashSet() } += allRunTasks
|
||||
sourceSet.dependsOnSourceSets.forEach { dependentModule ->
|
||||
dependsOnReverseGraph.getOrPut(dependentModule) { LinkedHashSet() } += sourceSet
|
||||
@@ -519,7 +519,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtensionComp
|
||||
val mppModel = resolverCtx.getMppModel(gradleModule) ?: return
|
||||
val sourceSetToPackagePrefix = mppModel.targets.flatMap { it.compilations }
|
||||
.flatMap { compilation ->
|
||||
compilation.sourceSets.map { sourceSet -> sourceSet.name to compilation.kotlinTaskProperties.packagePrefix }
|
||||
compilation.allSourceSets.map { sourceSet -> sourceSet.name to compilation.kotlinTaskProperties.packagePrefix }
|
||||
}
|
||||
.toMap()
|
||||
if (resolverCtx.getExtraProject(gradleModule, ExternalProject::class.java) == null) return
|
||||
@@ -601,7 +601,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtensionComp
|
||||
ideProject
|
||||
)
|
||||
KotlinNativeLibrariesFixer.applyTo(dataNode, ideProject)
|
||||
for (sourceSet in compilation.sourceSets) {
|
||||
for (sourceSet in compilation.allSourceSets) {
|
||||
(sourceSet.dependsOnSourceSets + sourceSet.name).forEach {
|
||||
sourceSetToCompilations
|
||||
.getOrPut(it) { mutableListOf() }
|
||||
@@ -655,7 +655,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtensionComp
|
||||
val dependeeSourceSets = closedSourceSetGraph.successors(sourceSet)
|
||||
val sourceSetInfos = if (isAndroid) {
|
||||
ideModule.kotlinAndroidSourceSets?.filter {
|
||||
(it.kotlinModule as? KotlinCompilation)?.sourceSets?.contains(sourceSet) ?: false
|
||||
(it.kotlinModule as? KotlinCompilation)?.allSourceSets?.contains(sourceSet) ?: false
|
||||
} ?: emptyList()
|
||||
} else {
|
||||
listOfNotNull(fromDataNode.kotlinSourceSet)
|
||||
@@ -940,7 +940,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtensionComp
|
||||
if (effectiveClassesDir != null) {
|
||||
sourcesWithTypes += compilation.sourceType to DefaultExternalSourceDirectorySet().also { dirSet ->
|
||||
dirSet.outputDir = effectiveClassesDir
|
||||
dirSet.srcDirs = compilation.sourceSets.flatMapTo(LinkedHashSet()) { it.sourceDirs }
|
||||
dirSet.srcDirs = compilation.allSourceSets.flatMapTo(LinkedHashSet()) { it.sourceDirs }
|
||||
dirSet.gradleOutputDirs += compilation.output.classesDirs
|
||||
dirSet.setInheritedCompilerOutput(false)
|
||||
}
|
||||
@@ -948,7 +948,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtensionComp
|
||||
if (resourcesDir != null) {
|
||||
sourcesWithTypes += compilation.resourceType to DefaultExternalSourceDirectorySet().also { dirSet ->
|
||||
dirSet.outputDir = resourcesDir
|
||||
dirSet.srcDirs = compilation.sourceSets.flatMapTo(LinkedHashSet()) { it.resourceDirs }
|
||||
dirSet.srcDirs = compilation.allSourceSets.flatMapTo(LinkedHashSet()) { it.resourceDirs }
|
||||
dirSet.gradleOutputDirs += resourcesDir
|
||||
dirSet.setInheritedCompilerOutput(false)
|
||||
}
|
||||
@@ -1040,7 +1040,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtensionComp
|
||||
sourceSetInfo.gradleModuleId = getModuleId(resolverCtx, gradleModule)
|
||||
sourceSetInfo.actualPlatforms.addSimplePlatforms(listOf(compilation.platform))
|
||||
sourceSetInfo.isTestModule = compilation.isTestModule
|
||||
sourceSetInfo.dependsOn = compilation.sourceSets.flatMap { it.dependsOnSourceSets }.map {
|
||||
sourceSetInfo.dependsOn = compilation.allSourceSets.flatMap { it.dependsOnSourceSets }.map {
|
||||
getGradleModuleQualifiedName(resolverCtx, gradleModule, it)
|
||||
}.distinct().toList()
|
||||
sourceSetInfo.compilerArguments =
|
||||
@@ -1050,7 +1050,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtensionComp
|
||||
sourceSetInfo.dependencyClasspath = compilation.dependencyClasspath.toList()
|
||||
sourceSetInfo.defaultCompilerArguments =
|
||||
createCompilerArguments(compilation.arguments.defaultArguments.toList(), compilation.platform)
|
||||
sourceSetInfo.addSourceSets(compilation.sourceSets, compilation.fullName(), gradleModule, resolverCtx)
|
||||
sourceSetInfo.addSourceSets(compilation.allSourceSets, compilation.fullName(), gradleModule, resolverCtx)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -102,7 +102,7 @@ interface KotlinCompilation : KotlinModule {
|
||||
* All source sets participated in this compilation, including those available
|
||||
* via dependsOn.
|
||||
*/
|
||||
val sourceSets: Collection<KotlinSourceSet>
|
||||
val allSourceSets: Collection<KotlinSourceSet>
|
||||
|
||||
/**
|
||||
* Only default source sets of this compilation, i.e. those which are included
|
||||
|
||||
@@ -365,12 +365,12 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
|
||||
private fun KotlinCompilationImpl.addDependsOnSourceSetsToCompilation(
|
||||
importingContext: MultiplatformModelImportingContext
|
||||
): KotlinCompilationImpl {
|
||||
val dependsOnSourceSets = this.sourceSets.flatMap { it.dependsOnSourceSets }.mapNotNull { importingContext.sourceSetByName(it) }
|
||||
val dependsOnSourceSets = this.allSourceSets.flatMap { it.dependsOnSourceSets }.mapNotNull { importingContext.sourceSetByName(it) }
|
||||
|
||||
return KotlinCompilationImpl(
|
||||
this.name,
|
||||
this.sourceSets.union(dependsOnSourceSets),
|
||||
this.sourceSets,
|
||||
this.allSourceSets.union(dependsOnSourceSets),
|
||||
this.allSourceSets,
|
||||
this.dependencies,
|
||||
this.output,
|
||||
this.arguments,
|
||||
|
||||
@@ -127,7 +127,7 @@ data class KotlinNativeCompilationExtensionsImpl(
|
||||
|
||||
data class KotlinCompilationImpl(
|
||||
override val name: String,
|
||||
override val sourceSets: Collection<KotlinSourceSet>,
|
||||
override val allSourceSets: Collection<KotlinSourceSet>,
|
||||
override val defaultSourceSets: Collection<KotlinSourceSet>,
|
||||
override val dependencies: Array<KotlinDependencyId>,
|
||||
override val output: KotlinCompilationOutput,
|
||||
@@ -140,7 +140,7 @@ data class KotlinCompilationImpl(
|
||||
// create deep copy
|
||||
constructor(kotlinCompilation: KotlinCompilation, cloningCache: MutableMap<Any, Any>) : this(
|
||||
kotlinCompilation.name,
|
||||
cloneSourceSetsWithCaching(kotlinCompilation.sourceSets, cloningCache),
|
||||
cloneSourceSetsWithCaching(kotlinCompilation.allSourceSets, cloningCache),
|
||||
cloneSourceSetsWithCaching(kotlinCompilation.defaultSourceSets, cloningCache),
|
||||
kotlinCompilation.dependencies,
|
||||
KotlinCompilationOutputImpl(kotlinCompilation.output),
|
||||
|
||||
@@ -109,7 +109,7 @@ internal class MultiplatformModelImportingContextImpl(override val project: Proj
|
||||
|
||||
for (target in targets) {
|
||||
for (compilation in target.compilations) {
|
||||
for (sourceSet in compilation.sourceSets) {
|
||||
for (sourceSet in compilation.allSourceSets) {
|
||||
sourceSetToCompilations.getOrPut(sourceSet) { LinkedHashSet() } += compilation
|
||||
sourceSet.dependsOnSourceSets.mapNotNull { sourceSetByName(it) }.forEach {
|
||||
sourceSetToCompilations.getOrPut(it) { LinkedHashSet() } += compilation
|
||||
|
||||
Reference in New Issue
Block a user