From 015941b1953ecacc464fd3448a7318d5a2f44a2b Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Fri, 24 Feb 2023 16:04:56 +0100 Subject: [PATCH] [Gradle] Ensure KotlinCompilationK2MultiplatformConfigurator does not force eager task evaluation ^KT-56210 Verification Pending --- .../KotlinCompilationK2MultiplatformConfigurator.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationK2MultiplatformConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationK2MultiplatformConfigurator.kt index 13db385dc71..24350f7cad7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationK2MultiplatformConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/compilationImpl/KotlinCompilationK2MultiplatformConfigurator.kt @@ -11,7 +11,8 @@ import org.jetbrains.kotlin.gradle.tasks.K2MultiplatformStructure internal object KotlinCompilationK2MultiplatformConfigurator : KotlinCompilationImplFactory.PreConfigure { override fun configure(compilation: KotlinCompilationImpl) { - compilation.project.tasks.matching { it.name == compilation.compileKotlinTaskName }.configureEach { compileTask -> + compilation.project.tasks.configureEach { compileTask -> + if (compileTask.name != compilation.compileKotlinTaskName) return@configureEach if (compileTask !is K2CompileTask) return@configureEach compileTask.multiplatformStructure.dependsOnEdges.set(compilation.project.provider {