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

[Gradle, JS] Fix configuration cache problem in KotlinJsIrLink task

Browse Source 
#KT-49253 Fixed
This commit is contained in:
Alexander Likhachev
2021-11-19 16:37:32 +03:00
parent 32839c7ba2
commit e6ae5db6ef
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt
+6 -1
View File
@@ -39,6 +39,7 @@ import org.jetbrains.kotlin.gradle.tasks.TaskOutputsBackup
import org.jetbrains.kotlin.gradle.utils.getAllDependencies import org.jetbrains.kotlin.gradle.utils.getAllDependencies
import org.jetbrains.kotlin.gradle.utils.getCacheDirectory import org.jetbrains.kotlin.gradle.utils.getCacheDirectory
import org.jetbrains.kotlin.gradle.utils.getDependenciesCacheDirectories import org.jetbrains.kotlin.gradle.utils.getDependenciesCacheDirectories
import org.jetbrains.kotlin.gradle.utils.getValue
import org.jetbrains.kotlin.statistics.metrics.BooleanMetrics import org.jetbrains.kotlin.statistics.metrics.BooleanMetrics
import java.io.File import java.io.File
import javax.inject.Inject import javax.inject.Inject
@@ -179,12 +180,16 @@ abstract class KotlinJsIrLink @Inject constructor(
super.setupCompilerArgs(args, defaultsOnly, ignoreClasspathResolutionErrors) super.setupCompilerArgs(args, defaultsOnly, ignoreClasspathResolutionErrors)
} }
private val platformType by project.provider {
compilation.platformType
}
private fun KotlinJsOptions.configureOptions(vararg additionalCompilerArgs: String) { private fun KotlinJsOptions.configureOptions(vararg additionalCompilerArgs: String) {
freeCompilerArgs += additionalCompilerArgs.toList() + freeCompilerArgs += additionalCompilerArgs.toList() +
PRODUCE_JS + PRODUCE_JS +
"$ENTRY_IR_MODULE=${entryModule.get().asFile.canonicalPath}" "$ENTRY_IR_MODULE=${entryModule.get().asFile.canonicalPath}"
if (compilation.platformType == KotlinPlatformType.wasm) { if (platformType == KotlinPlatformType.wasm) {
freeCompilerArgs += WASM_BACKEND freeCompilerArgs += WASM_BACKEND
} }
} }