From a41b746774f7c823419962ba639a6a7d473dc5e8 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Fri, 29 May 2020 19:39:17 +0300 Subject: [PATCH] Revert "[Gradle, JS] Output file path as input fo js compile task" This reverts commit df173c8c --- .../kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index 5c220d92da2..ec1903c4698 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -216,7 +216,6 @@ abstract class AbstractKotlinCompile() : AbstractKo @get:Internal internal var coroutinesFromGradleProperties: Coroutines? = null - // Input is needed to force rebuild even if source files are not changed @get:Input internal val coroutinesStr: String @@ -528,13 +527,10 @@ open class Kotlin2JsCompile : AbstractKotlinCompile(), Ko else -> incremental } - @get:Internal + @Suppress("unused") + @get:OutputFile val outputFile: File - get() = outputFilePath?.let(::File) ?: defaultOutputFile - - @get:Input - val outputFilePath: String? - get() = kotlinOptions.outputFile + get() = kotlinOptions.outputFile?.let(::File) ?: defaultOutputFile override fun findKotlinCompilerClasspath(project: Project): List = findKotlinJsCompilerClasspath(project)