From 4fa87d2caa853a28655c462e23d8fb30c49a49a5 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 13 Feb 2020 13:15:51 +0300 Subject: [PATCH] [Gradle, JS] Compilations with js type because of compatibility - In kotlinx.html there is invocation of packageJson function on compilations["main"] It can be casted in user script to KotlinJsCompilation, or override on plugin side --- .../kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt index 2627b9f1bf1..00403e6523b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt @@ -10,6 +10,7 @@ import org.gradle.api.NamedDomainObjectContainer import org.gradle.util.ConfigureUtil import org.jetbrains.kotlin.gradle.dsl.KotlinJsDce import org.jetbrains.kotlin.gradle.plugin.KotlinTarget +import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.KotlinJsPlatformTestRun import org.jetbrains.kotlin.gradle.targets.js.KotlinJsReportAggregatingTestRun import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsExec @@ -52,6 +53,9 @@ interface KotlinJsTargetDsl : KotlinTarget { fun produceExecutable() val testRuns: NamedDomainObjectContainer + + // Need to compatibility when users use KotlinJsCompilation specific in build script + override val compilations: NamedDomainObjectContainer } interface KotlinJsSubTargetDsl {