erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-27 08:38:13 -07:00
Code Releases Activity

Better separate kotlinc flag management.

Browse source
This commit is contained in:
Cedric Beust 2017-02-09 10:46:58 -08:00
parent 53f9804ea0
commit 0d661b126f
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
View file

@ -93,9 +93,12 @@ class KotlinCompiler @Inject constructor(
val compilerClasspath = compilerDep.jarFile.get().path + File.pathSeparator + val compilerClasspath = compilerDep.jarFile.get().path + File.pathSeparator +
compilerEmbeddableDependencies(null).map { it.jarFile.get().path } compilerEmbeddableDependencies(null).map { it.jarFile.get().path }
.joinToString(File.pathSeparator) .joinToString(File.pathSeparator)
val xFlagsString = kotlinConfig(project)?.args?.joinToString(" ") val xFlagsString = listOf(kotlinConfig(project)?.args?.joinToString(" "),
?: settings.kobaltCompilerFlags settings.kobaltCompilerFlags)
val xFlagsArray = xFlagsString?.split(" ")?.toTypedArray() ?: emptyArray() .filterNotNull()
.joinToString(" ")
val xFlagsArray = xFlagsString.split(" ").toTypedArray() ?: emptyArray()
val newArgs = listOf( val newArgs = listOf(
"-classpath", compilerClasspath, "-classpath", compilerClasspath,
K2JVMCompiler::class.java.name, K2JVMCompiler::class.java.name,