From 522fdb3e59c1ffc8bf39800611e2176037a13def Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Fri, 25 Sep 2020 14:06:57 +0300 Subject: [PATCH] [Gradle, JS] Empty compiler plugin classpath for KotlinJsIrLink ^KT-42245 fixed --- .../jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt | 4 ++++ .../main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 2 +- 2 files changed, 5 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 421f81946ca..3024c8c6510 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 @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.gradle.targets.js.ir +import org.gradle.api.file.FileCollection import org.gradle.api.file.FileTree import org.gradle.api.file.RegularFileProperty import org.gradle.api.tasks.* @@ -21,6 +22,9 @@ import java.io.File @CacheableTask open class KotlinJsIrLink : Kotlin2JsCompile() { + // Link tasks are not affected by compiler plugin + override val pluginClasspath: FileCollection = project.objects.fileCollection() + @Input lateinit var mode: KotlinJsBinaryMode diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index f02aa148e4f..5df1e0d974f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -213,7 +213,7 @@ abstract class AbstractKotlinCompile() : AbstractKo @get:InputFiles @get:Classpath - val pluginClasspath: FileCollection = project.configurations.getByName(PLUGIN_CLASSPATH_CONFIGURATION_NAME) + open val pluginClasspath: FileCollection = project.configurations.getByName(PLUGIN_CLASSPATH_CONFIGURATION_NAME) @get:Internal internal val pluginOptions = CompilerPluginOptions()