From 5657afc35bde28d6cf26163a97c14a6202b8ec92 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 26 Mar 2020 10:57:00 +0300 Subject: [PATCH] [Gradle, JS] Add tolerance for NodeJsExec inputFileProperty - no error if it is not present --- .../kotlin/gradle/targets/js/nodejs/NodeJsExec.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 a9c92ff2443..47e4961a80b 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 @@ -9,11 +9,9 @@ import org.gradle.api.file.RegularFileProperty import org.gradle.api.tasks.* import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency -import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation import org.jetbrains.kotlin.gradle.targets.js.npm.RequiresNpmDependencies import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject import org.jetbrains.kotlin.gradle.tasks.registerTask -import org.jetbrains.kotlin.gradle.utils.getValue import org.jetbrains.kotlin.gradle.utils.newFileProperty open class NodeJsExec : AbstractExecTask(NodeJsExec::class.java), RequiresNpmDependencies { @@ -25,7 +23,7 @@ open class NodeJsExec : AbstractExecTask(NodeJsExec::class.java), Re init { onlyIf { - inputFileProperty.asFile.map { + !inputFileProperty.isPresent || inputFileProperty.asFile.map { it.exists() }.get() } @@ -50,6 +48,10 @@ open class NodeJsExec : AbstractExecTask(NodeJsExec::class.java), Re } override fun exec() { + if (inputFileProperty.isPresent) { + args(inputFileProperty.asFile.get()) + } + if (sourceMapStackTraces) { val sourceMapSupportArgs = mutableListOf( "--require", @@ -84,8 +86,6 @@ open class NodeJsExec : AbstractExecTask(NodeJsExec::class.java), Re it.dependsOn(nodeJs.npmInstallTask, compileKotlinTask) it.configuration() - - it.args(it.inputFileProperty.asFile.get()) } } }