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

[Gradle][MPP] CompilationDetails.source: Use .forAll over 'whenEvaluated'

Browse Source 
KT-52726
This commit is contained in:
Sebastian Sellmair
2022-09-06 14:46:27 +02:00
committed by Space
parent c6e9216663
commit 5f924518af
2 changed files with 33 additions and 35 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/CompilationDetails.kt
+3 -5
View File
@@ -266,8 +266,8 @@ open class DefaultCompilationDetails<T : KotlinCommonOptions>(
override fun source(sourceSet: KotlinSourceSet) { override fun source(sourceSet: KotlinSourceSet) {
if (directlyIncludedKotlinSourceSets.add(sourceSet)) { if (directlyIncludedKotlinSourceSets.add(sourceSet)) {
target.project.whenEvaluated { sourceSet.internal.withDependsOnClosure.forAll { inWithDependsOnClosure ->
addExactSourceSetsEagerly(sourceSet.internal.withDependsOnClosure) addExactSourceSetEagerly(inWithDependsOnClosure)
} }
} }
} }
@@ -280,10 +280,9 @@ open class DefaultCompilationDetails<T : KotlinCommonOptions>(
addAsCommonSources addAsCommonSources
) { sourceSet.kotlin } ) { sourceSet.kotlin }
internal fun addExactSourceSetsEagerly(sourceSets: Set<KotlinSourceSet>) { internal fun addExactSourceSetEagerly(sourceSet: KotlinSourceSet) {
with(target.project) { with(target.project) {
//TODO possibly issue with forced instantiation //TODO possibly issue with forced instantiation
sourceSets.forEach { sourceSet ->
addSourcesToCompileTask( addSourcesToCompileTask(
sourceSet, sourceSet,
addAsCommonSources = lazy { addAsCommonSources = lazy {
@@ -320,7 +319,6 @@ open class DefaultCompilationDetails<T : KotlinCommonOptions>(
} }
} }
} }
}
} }
open class DefaultCompilationDetailsWithRuntime<T : KotlinCommonOptions>( open class DefaultCompilationDetailsWithRuntime<T : KotlinCommonOptions>(
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/metadata/KotlinMetadataTargetConfigurator.kt
+1 -1
View File
@@ -316,7 +316,7 @@ class KotlinMetadataTargetConfigurator :
return compilationFactory.create(compilationName).apply { return compilationFactory.create(compilationName).apply {
target.compilations.add(this@apply) target.compilations.add(this@apply)
(compilationDetails as DefaultCompilationDetails<*>).addExactSourceSetsEagerly(setOf(sourceSet)) (compilationDetails as DefaultCompilationDetails<*>).addExactSourceSetEagerly(sourceSet)
configureMetadataDependenciesForCompilation(this@apply) configureMetadataDependenciesForCompilation(this@apply)