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

[Gradle, JS] Link test task with property of compile task

Browse Source
This commit is contained in:
Ilya Goncharov
2020-01-14 18:39:35 +03:00
parent dd577e1008
commit 0c7284de01
2 changed files with 9 additions and 1 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/KotlinJsIrSubTarget.kt
+3 -1
View File
@@ -124,7 +124,9 @@ abstract class KotlinJsIrSubTarget(
testJs.group = LifecycleBasePlugin.VERIFICATION_GROUP testJs.group = LifecycleBasePlugin.VERIFICATION_GROUP
testJs.description = testTaskDescription testJs.description = testTaskDescription
testJs.dependsOn(nodeJs.npmInstallTask, compileTask, nodeJs.nodeJsSetupTask) testJs.inputFileProperty.set(compilation.developmentLinkTask.outputFileProperty)
testJs.dependsOn(nodeJs.npmInstallTask, nodeJs.nodeJsSetupTask)
testJs.onlyIf { testJs.onlyIf {
compileTask.outputFile.exists() compileTask.outputFile.exists()
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTest.kt
+6
View File
@@ -7,7 +7,9 @@ package org.jetbrains.kotlin.gradle.targets.js.ir
import groovy.lang.Closure import groovy.lang.Closure
import org.gradle.api.file.FileCollection import org.gradle.api.file.FileCollection
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.tasks.Input import org.gradle.api.tasks.Input
import org.gradle.api.tasks.InputFile
import org.gradle.api.tasks.InputFiles import org.gradle.api.tasks.InputFiles
import org.gradle.api.tasks.Internal import org.gradle.api.tasks.Internal
import org.gradle.process.internal.DefaultProcessForkOptions import org.gradle.process.internal.DefaultProcessForkOptions
@@ -21,6 +23,7 @@ import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
import org.jetbrains.kotlin.gradle.targets.js.testing.karma.KotlinKarma import org.jetbrains.kotlin.gradle.targets.js.testing.karma.KotlinKarma
import org.jetbrains.kotlin.gradle.targets.js.testing.mocha.KotlinMocha import org.jetbrains.kotlin.gradle.targets.js.testing.mocha.KotlinMocha
import org.jetbrains.kotlin.gradle.tasks.KotlinTest import org.jetbrains.kotlin.gradle.tasks.KotlinTest
import org.jetbrains.kotlin.gradle.utils.newFileProperty
open class KotlinJsIrTest : open class KotlinJsIrTest :
KotlinTest(), KotlinTest(),
@@ -41,6 +44,9 @@ open class KotlinJsIrTest :
@Internal @Internal
override lateinit var compilation: KotlinJsIrCompilation override lateinit var compilation: KotlinJsIrCompilation
@InputFile
val inputFileProperty: RegularFileProperty = project.newFileProperty()
@Suppress("unused") @Suppress("unused")
val runtimeClasspath: FileCollection val runtimeClasspath: FileCollection
@InputFiles get() = compilation.runtimeDependencyFiles @InputFiles get() = compilation.runtimeDependencyFiles