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

Gradle, js, tests: use compilation runtime classpath as input

Browse Source 
#KT-31814 Fixed
This commit is contained in:
Sergey Rostov
2019-06-05 14:05:49 +03:00
parent f32d48c66d
commit 96fc06c7fb
1 changed files with 7 additions and 6 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/testing/KotlinJsTest.kt
+7 -6
View File
@@ -6,10 +6,8 @@
package org.jetbrains.kotlin.gradle.targets.js.testing package org.jetbrains.kotlin.gradle.targets.js.testing
import groovy.lang.Closure import groovy.lang.Closure
import org.gradle.api.tasks.Input import org.gradle.api.file.FileCollection
import org.gradle.api.tasks.InputFile import org.gradle.api.tasks.*
import org.gradle.api.tasks.Internal
import org.gradle.api.tasks.SkipWhenEmpty
import org.gradle.process.internal.DefaultProcessForkOptions import org.gradle.process.internal.DefaultProcessForkOptions
import org.gradle.util.ConfigureUtil import org.gradle.util.ConfigureUtil
import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec
@@ -29,6 +27,7 @@ open class KotlinJsTest : KotlinTest(), RequiresNpmDependencies {
@get:Internal @get:Internal
internal var testFramework: KotlinJsTestFramework? = null internal var testFramework: KotlinJsTestFramework? = null
@Suppress("unused")
val testFrameworkSettings: String val testFrameworkSettings: String
@Input get() = testFramework!!.settingsState @Input get() = testFramework!!.settingsState
@@ -38,9 +37,11 @@ open class KotlinJsTest : KotlinTest(), RequiresNpmDependencies {
@Internal @Internal
override lateinit var compilation: KotlinJsCompilation override lateinit var compilation: KotlinJsCompilation
val entry: File @Suppress("unused")
@InputFile get() = compilation.compileKotlinTask.outputFile val runtimeClasspath: FileCollection
@InputFiles get() = compilation.runtimeDependencyFiles
@Suppress("unused")
val compilationId: String val compilationId: String
@Input get() = compilation.let { @Input get() = compilation.let {
val target = it.target val target = it.target