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

Kotlin Gradle Plugin: Extend implicit argument set

Browse Source
This commit is contained in:
Alexey Sedunov
2017-02-13 14:36:09 +03:00
parent 75c56d58ae
commit 1452d7e4a6
1 changed files with 5 additions and 3 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
+5 -3
View File
@@ -190,8 +190,6 @@ open class KotlinCompile : AbstractKotlinCompile<K2JVMCompilerArguments>(), 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<K2JVMCompilerArguments>(), Kotl
}
friendTaskName?.let { addFriendPathForTestTask(it, args) }
if (defaultsOnly) return args
parentKotlinOptionsImpl?.updateArguments(args)
kotlinOptionsImpl.updateArguments(args)
@@ -332,9 +333,10 @@ open class Kotlin2JsCompile() : AbstractKotlinCompile<K2JSCompilerArguments>(),
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
}