azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Fix run for nodejs with IR backend

Browse Source
This commit is contained in:
Ilya Goncharov
2020-01-13 18:53:49 +03:00
parent 14387332d5
commit 4bd744f163
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinNodeJsIr.kt
+5 -3
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.gradle.targets.js.ir 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.dsl.KotlinJsIrNodeDsl
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsExec import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsExec
import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
@@ -39,9 +38,12 @@ open class KotlinNodeJsIr @Inject constructor(target: KotlinJsIrTarget) :
} }
private fun configureRun( 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) target.runTask.dependsOn(runTaskHolder)
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt
-1
View File
@@ -77,7 +77,6 @@ open class NodeJsExec : AbstractExecTask<NodeJsExec>(NodeJsExec::class.java), Re
val compileKotlinTask = compilation.compileKotlinTask val compileKotlinTask = compilation.compileKotlinTask
it.dependsOn(nodeJs.npmInstallTask, compileKotlinTask) it.dependsOn(nodeJs.npmInstallTask, compileKotlinTask)
it.args(compileKotlinTask.outputFile)
it.configuration() it.configuration()
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt
+3 -1
View File
@@ -35,7 +35,9 @@ open class KotlinNodeJs @Inject constructor(target: KotlinJsTarget) :
private fun configureRun( private fun configureRun(
compilation: KotlinJsCompilation 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) target.runTask.dependsOn(runTaskHolder)
} }