From 18fa5266b796dbe4f5c970f94e73e69e56c94657 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 23 Jan 2020 13:49:35 +0300 Subject: [PATCH] [Gradle, JS] Producing for ir target through legacy target --- .../gradle/targets/js/subtargets/KotlinBrowserJs.kt | 10 ++++++++++ .../gradle/targets/js/subtargets/KotlinNodeJs.kt | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt index a131074ee33..55677b01949 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt @@ -43,6 +43,16 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) : override val testTaskDescription: String get() = "Run all ${target.name} tests inside browser using karma and webpack" + override fun produceKotlinLibrary() { + super.produceKotlinLibrary() + target.irTarget?.browser?.produceKotlinLibrary() + } + + override fun produceExecutable() { + super.produceExecutable() + target.irTarget?.browser?.produceExecutable() + } + override fun configure() { super.configure() browserProducingConfiguredHandlers.forEach { handler -> diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt index 4f956b465e6..fc32c39b9b4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt @@ -20,6 +20,16 @@ open class KotlinNodeJs @Inject constructor(target: KotlinJsTarget) : private val runTaskName = disambiguateCamelCased("run") + override fun produceKotlinLibrary() { + super.produceKotlinLibrary() + target.irTarget?.nodejs?.produceKotlinLibrary() + } + + override fun produceExecutable() { + super.produceExecutable() + target.irTarget?.nodejs?.produceExecutable() + } + override fun configure() { super.configure() nodejsProducingConfiguredHandlers.forEach { handler ->