From 96fc06c7fb1168a048532a22a41775ab998c8285 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Wed, 5 Jun 2019 14:05:49 +0300 Subject: [PATCH] Gradle, js, tests: use compilation runtime classpath as input #KT-31814 Fixed --- .../gradle/targets/js/testing/KotlinJsTest.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTest.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTest.kt index 5a862ec7fd1..cdfcace335c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTest.kt @@ -6,10 +6,8 @@ package org.jetbrains.kotlin.gradle.targets.js.testing import groovy.lang.Closure -import org.gradle.api.tasks.Input -import org.gradle.api.tasks.InputFile -import org.gradle.api.tasks.Internal -import org.gradle.api.tasks.SkipWhenEmpty +import org.gradle.api.file.FileCollection +import org.gradle.api.tasks.* import org.gradle.process.internal.DefaultProcessForkOptions import org.gradle.util.ConfigureUtil import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec @@ -29,6 +27,7 @@ open class KotlinJsTest : KotlinTest(), RequiresNpmDependencies { @get:Internal internal var testFramework: KotlinJsTestFramework? = null + @Suppress("unused") val testFrameworkSettings: String @Input get() = testFramework!!.settingsState @@ -38,9 +37,11 @@ open class KotlinJsTest : KotlinTest(), RequiresNpmDependencies { @Internal override lateinit var compilation: KotlinJsCompilation - val entry: File - @InputFile get() = compilation.compileKotlinTask.outputFile + @Suppress("unused") + val runtimeClasspath: FileCollection + @InputFiles get() = compilation.runtimeDependencyFiles + @Suppress("unused") val compilationId: String @Input get() = compilation.let { val target = it.target