From 1452d7e4a6e535127a7e08ad05abedcb915b0c58 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Mon, 13 Feb 2017 14:36:09 +0300 Subject: [PATCH] Kotlin Gradle Plugin: Extend implicit argument set --- .../kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 08c6153f94e..4e68237d9a0 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 @@ -190,8 +190,6 @@ open class KotlinCompile : AbstractKotlinCompile(), Kotl override fun populateCompilerArguments(defaultsOnly: Boolean): K2JVMCompilerArguments { val args = K2JVMCompilerArguments().apply { fillDefaultValues() } - if (defaultsOnly) return args - handleKaptProperties() args.pluginClasspaths = pluginOptions.classpath.toTypedArray() args.pluginOptions = pluginOptions.arguments.toTypedArray() @@ -204,6 +202,9 @@ open class KotlinCompile : AbstractKotlinCompile(), Kotl } friendTaskName?.let { addFriendPathForTestTask(it, args) } + + if (defaultsOnly) return args + parentKotlinOptionsImpl?.updateArguments(args) kotlinOptionsImpl.updateArguments(args) @@ -332,9 +333,10 @@ open class Kotlin2JsCompile() : AbstractKotlinCompile(), override fun populateCompilerArguments(defaultsOnly: Boolean): K2JSCompilerArguments { val args = K2JSCompilerArguments().apply { fillDefaultValues() } + args.outputFile = outputFile + if (defaultsOnly) return args - args.outputFile = outputFile kotlinOptionsImpl.updateArguments(args) return args }