From 8ce820d944da80ff40483658116bf9c3d61a3a7b Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Fri, 4 Aug 2023 15:53:18 +0200 Subject: [PATCH] [Gradle][Minor] KotlinJsIrSourceSetProcessor: Access runtimeDependencyFiles safely As it might happen, that the configure code could be triggered too early, capturing the state of 'runtimeDependencyFiles' to early as well. ^KT-60937 Verification Pending --- .../kotlin/gradle/plugin/KotlinJsIrSourceSetProcessor.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsIrSourceSetProcessor.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsIrSourceSetProcessor.kt index 57f5015e987..1eb27751d0f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsIrSourceSetProcessor.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsIrSourceSetProcessor.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.gradle.utils.filesProvider internal class KotlinJsIrSourceSetProcessor( tasksProvider: KotlinTasksProvider, - kotlinCompilation: KotlinCompilationInfo + kotlinCompilation: KotlinCompilationInfo, ) : KotlinSourceSetProcessor( tasksProvider, taskDescription = "Compiles the Kotlin sources in $kotlinCompilation to JavaScript.", kotlinCompilation = kotlinCompilation @@ -47,7 +47,7 @@ internal class KotlinJsIrSourceSetProcessor( val configAction = KotlinJsIrLinkConfig(binary) configAction.configureTask { it.description = taskDescription - it.libraries.from(compilation.runtimeDependencyFiles) + it.libraries.from(project.filesProvider { compilation.runtimeDependencyFiles }) } configAction.configureTask { task -> task.modeProperty.set(binary.mode)