From e6ae5db6ef25ca41639bdae853933118bd8e7089 Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Fri, 19 Nov 2021 16:37:32 +0300 Subject: [PATCH] [Gradle, JS] Fix configuration cache problem in `KotlinJsIrLink` task #KT-49253 Fixed --- .../kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt index f0ee6630c34..6a5e705b1f1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt @@ -39,6 +39,7 @@ import org.jetbrains.kotlin.gradle.tasks.TaskOutputsBackup import org.jetbrains.kotlin.gradle.utils.getAllDependencies import org.jetbrains.kotlin.gradle.utils.getCacheDirectory import org.jetbrains.kotlin.gradle.utils.getDependenciesCacheDirectories +import org.jetbrains.kotlin.gradle.utils.getValue import org.jetbrains.kotlin.statistics.metrics.BooleanMetrics import java.io.File import javax.inject.Inject @@ -179,12 +180,16 @@ abstract class KotlinJsIrLink @Inject constructor( super.setupCompilerArgs(args, defaultsOnly, ignoreClasspathResolutionErrors) } + private val platformType by project.provider { + compilation.platformType + } + private fun KotlinJsOptions.configureOptions(vararg additionalCompilerArgs: String) { freeCompilerArgs += additionalCompilerArgs.toList() + PRODUCE_JS + "$ENTRY_IR_MODULE=${entryModule.get().asFile.canonicalPath}" - if (compilation.platformType == KotlinPlatformType.wasm) { + if (platformType == KotlinPlatformType.wasm) { freeCompilerArgs += WASM_BACKEND } }