[Gradle, JS] Check existence of input file before run and test
#KT-36326 fixed
This commit is contained in:
+5
-2
@@ -122,8 +122,11 @@ abstract class KotlinJsIrSubTarget(
|
|||||||
|
|
||||||
testJs.dependsOn(nodeJs.npmInstallTask, nodeJs.nodeJsSetupTask)
|
testJs.dependsOn(nodeJs.npmInstallTask, nodeJs.nodeJsSetupTask)
|
||||||
|
|
||||||
testJs.onlyIf {
|
testJs.onlyIf { task ->
|
||||||
compileTask.outputFile.exists()
|
(task as KotlinJsTest).inputFileProperty
|
||||||
|
.asFile
|
||||||
|
.map { it.exists() }
|
||||||
|
.get()
|
||||||
}
|
}
|
||||||
|
|
||||||
testJs.compilation = compilation
|
testJs.compilation = compilation
|
||||||
|
|||||||
+5
-2
@@ -9,9 +9,11 @@ import org.gradle.api.file.RegularFileProperty
|
|||||||
import org.gradle.api.tasks.*
|
import org.gradle.api.tasks.*
|
||||||
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
|
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency
|
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.RequiresNpmDependencies
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
|
import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
|
||||||
import org.jetbrains.kotlin.gradle.tasks.registerTask
|
import org.jetbrains.kotlin.gradle.tasks.registerTask
|
||||||
|
import org.jetbrains.kotlin.gradle.utils.getValue
|
||||||
import org.jetbrains.kotlin.gradle.utils.newFileProperty
|
import org.jetbrains.kotlin.gradle.utils.newFileProperty
|
||||||
|
|
||||||
open class NodeJsExec : AbstractExecTask<NodeJsExec>(NodeJsExec::class.java), RequiresNpmDependencies {
|
open class NodeJsExec : AbstractExecTask<NodeJsExec>(NodeJsExec::class.java), RequiresNpmDependencies {
|
||||||
@@ -23,8 +25,9 @@ open class NodeJsExec : AbstractExecTask<NodeJsExec>(NodeJsExec::class.java), Re
|
|||||||
|
|
||||||
init {
|
init {
|
||||||
onlyIf {
|
onlyIf {
|
||||||
compilation.compileKotlinTask.outputFile
|
inputFileProperty.asFile.map {
|
||||||
.exists()
|
it.exists()
|
||||||
|
}.get()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user