From 0b9c5b1cf02318c4922e5eb1db287d058c3923e1 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Wed, 7 Sep 2022 16:55:22 +0200 Subject: [PATCH] [Gradle][MPP] CompilationDetails: Rename kotlinSourceSetsClosure to allKotlinSourceSets ^KT-52726 Verification Pending --- .../gradle/plugin/mpp/AbstractCompilationDetails.kt | 8 ++++---- .../kotlin/gradle/plugin/mpp/AbstractKotlinCompilation.kt | 2 +- .../kotlin/gradle/plugin/mpp/CompilationDetails.kt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractCompilationDetails.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractCompilationDetails.kt index 2ffb30d5f4c..1bafe19ee7c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractCompilationDetails.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractCompilationDetails.kt @@ -19,19 +19,19 @@ abstract class AbstractCompilationDetails : Compilation final override val directlyIncludedKotlinSourceSets: ObservableSet get() = directlyIncludedKotlinSourceSetsImpl - private val kotlinSourceSetsClosureImpl: MutableObservableSet by lazy { + private val allKotlinSourceSetsImpl: MutableObservableSet by lazy { MutableObservableSet().also { set -> defaultSourceSet.internal.withDependsOnClosure.forAll(set::add) } } - final override val kotlinSourceSetsClosure: ObservableSet - get() = kotlinSourceSetsClosureImpl + final override val allKotlinSourceSets: ObservableSet + 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) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinCompilation.kt index 0443084c99d..3756849d4d0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinCompilation.kt @@ -66,7 +66,7 @@ abstract class AbstractKotlinCompilation( get() = compilationDetails.directlyIncludedKotlinSourceSets override val allKotlinSourceSets: ObservableSet - get() = compilationDetails.kotlinSourceSetsClosure + get() = compilationDetails.allKotlinSourceSets final override val defaultSourceSetName: String get() = compilationDetails.defaultSourceSetName diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt index af5ef0f6afd..846fb8c6cc0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt @@ -51,7 +51,7 @@ interface CompilationDetails { fun source(sourceSet: KotlinSourceSet) val directlyIncludedKotlinSourceSets: ObservableSet - val kotlinSourceSetsClosure: ObservableSet + val allKotlinSourceSets: ObservableSet val defaultSourceSetName: String @Suppress("UNCHECKED_CAST")