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

[Gradle][MPP] CompilationDetails: Rename kotlinSourceSetsClosure to allKotlinSourceSets

Browse Source 
^KT-52726 Verification Pending
This commit is contained in:
Sebastian Sellmair
2022-09-07 16:55:22 +02:00
committed by Space
parent 0f5a298689
commit 0b9c5b1cf0
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractCompilationDetails.kt
+4 -4
View File
@@ -19,19 +19,19 @@ abstract class AbstractCompilationDetails<T : KotlinCommonOptions> : Compilation
final override val directlyIncludedKotlinSourceSets: ObservableSet<KotlinSourceSet>
get() = directlyIncludedKotlinSourceSetsImpl
private val kotlinSourceSetsClosureImpl: MutableObservableSet<KotlinSourceSet> by lazy {
private val allKotlinSourceSetsImpl: MutableObservableSet<KotlinSourceSet> by lazy {
MutableObservableSet<KotlinSourceSet>().also { set ->
defaultSourceSet.internal.withDependsOnClosure.forAll(set::add)
}
}
final override val kotlinSourceSetsClosure: ObservableSet<KotlinSourceSet>
get() = kotlinSourceSetsClosureImpl
final override val allKotlinSourceSets: ObservableSet<KotlinSourceSet>
get() = allKotlinSourceSetsImpl
final override fun source(sourceSet: KotlinSourceSet) {
directlyIncludedKotlinSourceSetsImpl.add(sourceSet)
sourceSet.internal.withDependsOnClosure.forAll { withDependsOn ->
kotlinSourceSetsClosureImpl.add(withDependsOn)
allKotlinSourceSetsImpl.add(withDependsOn)
withDependsOn.internal.addCompilation(compilation)
}
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinCompilation.kt
+1 -1
View File
@@ -66,7 +66,7 @@ abstract class AbstractKotlinCompilation<T : KotlinCommonOptions>(
get() = compilationDetails.directlyIncludedKotlinSourceSets
override val allKotlinSourceSets: ObservableSet<KotlinSourceSet>
get() = compilationDetails.kotlinSourceSetsClosure
get() = compilationDetails.allKotlinSourceSets
final override val defaultSourceSetName: String get() = compilationDetails.defaultSourceSetName
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt
+1 -1
View File
@@ -51,7 +51,7 @@ interface CompilationDetails<T : KotlinCommonOptions> {
fun source(sourceSet: KotlinSourceSet)
val directlyIncludedKotlinSourceSets: ObservableSet<KotlinSourceSet>
val kotlinSourceSetsClosure: ObservableSet<KotlinSourceSet>
val allKotlinSourceSets: ObservableSet<KotlinSourceSet>
val defaultSourceSetName: String
@Suppress("UNCHECKED_CAST")