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

Revert "[Gradle, JS] Output file path as input fo js compile task"

Browse Source 
This reverts commit df173c8c
This commit is contained in:
Ilya Goncharov
2020-05-29 19:39:17 +03:00
parent df173c8c93
commit a41b746774
1 changed files with 3 additions and 7 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/tasks/Tasks.kt
+3 -7
View File
@@ -216,7 +216,6 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments>() : AbstractKo
@get:Internal @get:Internal
internal var coroutinesFromGradleProperties: Coroutines? = null internal var coroutinesFromGradleProperties: Coroutines? = null
// Input is needed to force rebuild even if source files are not changed // Input is needed to force rebuild even if source files are not changed
@get:Input @get:Input
internal val coroutinesStr: String internal val coroutinesStr: String
@@ -528,13 +527,10 @@ open class Kotlin2JsCompile : AbstractKotlinCompile<K2JSCompilerArguments>(), Ko
else -> incremental else -> incremental
} }
@get:Internal @Suppress("unused")
@get:OutputFile
val outputFile: File val outputFile: File
get() = outputFilePath?.let(::File) ?: defaultOutputFile get() = kotlinOptions.outputFile?.let(::File) ?: defaultOutputFile
@get:Input
val outputFilePath: String?
get() = kotlinOptions.outputFile
override fun findKotlinCompilerClasspath(project: Project): List<File> = override fun findKotlinCompilerClasspath(project: Project): List<File> =
findKotlinJsCompilerClasspath(project) findKotlinJsCompilerClasspath(project)