From 4bd744f1634b5ff14038996ced0d235653976167 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 13 Jan 2020 18:53:49 +0300 Subject: [PATCH] [Gradle, JS] Fix run for nodejs with IR backend --- .../kotlin/gradle/targets/js/ir/KotlinNodeJsIr.kt | 8 +++++--- .../kotlin/gradle/targets/js/nodejs/NodeJsExec.kt | 1 - .../kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt | 4 +++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinNodeJsIr.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinNodeJsIr.kt index 472d677a471..a6ee8adf903 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinNodeJsIr.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinNodeJsIr.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.gradle.targets.js.ir -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsIrNodeDsl import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsExec import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest @@ -39,9 +38,12 @@ open class KotlinNodeJsIr @Inject constructor(target: KotlinJsIrTarget) : } private fun configureRun( - compilation: KotlinJsCompilation + compilation: KotlinJsIrCompilation ) { - val runTaskHolder = NodeJsExec.create(compilation, disambiguateCamelCased(RUN_TASK_NAME)) + val runTaskHolder = NodeJsExec.create(compilation, disambiguateCamelCased(RUN_TASK_NAME)) { + dependsOn(compilation.developmentLinkTaskName) + args(compilation.developmentLinkTask.outputFile) + } target.runTask.dependsOn(runTaskHolder) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt index 68d3c73362a..c17a81ecf24 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt @@ -77,7 +77,6 @@ open class NodeJsExec : AbstractExecTask(NodeJsExec::class.java), Re val compileKotlinTask = compilation.compileKotlinTask it.dependsOn(nodeJs.npmInstallTask, compileKotlinTask) - it.args(compileKotlinTask.outputFile) it.configuration() } 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 5b1c40c5a4a..b2b20f156c1 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 @@ -35,7 +35,9 @@ open class KotlinNodeJs @Inject constructor(target: KotlinJsTarget) : private fun configureRun( compilation: KotlinJsCompilation ) { - val runTaskHolder = NodeJsExec.create(compilation, disambiguateCamelCased(RUN_TASK_NAME)) + val runTaskHolder = NodeJsExec.create(compilation, disambiguateCamelCased(RUN_TASK_NAME)) { + args(compilation.compileKotlinTask.outputFile) + } target.runTask.dependsOn(runTaskHolder) }