From d33521052f0e8b13a7a9b1f04fbf09d0c3b2dd7a Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 27 Jan 2020 16:29:41 +0300 Subject: [PATCH] [Gradle, JS] In Ir target should configure Ir subtarget --- .../kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt index 41a13d00087..22461fb6308 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt @@ -18,7 +18,6 @@ import org.jetbrains.kotlin.gradle.targets.js.KotlinJsProducingType import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsIrBrowserDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsIrNodeDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsIrTargetDsl -import org.jetbrains.kotlin.gradle.targets.js.subtargets.KotlinJsSubTarget import org.jetbrains.kotlin.gradle.tasks.locateTask import org.jetbrains.kotlin.gradle.testing.internal.KotlinTestReport import org.jetbrains.kotlin.gradle.testing.testTaskName @@ -99,7 +98,7 @@ open class KotlinJsIrTarget @Inject constructor(project: Project, platformType: private fun produce( producingType: KotlinJsProducingType, - producer: KotlinJsSubTarget.() -> Unit + producer: KotlinJsIrSubTarget.() -> Unit ) { check(this.producingType == null || this.producingType == producingType) { "Only one producing type supported. Try to set $producingType but previously ${this.producingType} found" @@ -108,11 +107,11 @@ open class KotlinJsIrTarget @Inject constructor(project: Project, platformType: this.producingType = producingType whenBrowserConfigured { - (this as KotlinJsSubTarget).producer() + (this as KotlinJsIrSubTarget).producer() } whenNodejsConfigured { - (this as KotlinJsSubTarget).producer() + (this as KotlinJsIrSubTarget).producer() } }