From 1d015a6f93e76d635fd43a7f394fd0a28f23e65f Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Wed, 19 Apr 2017 11:16:28 -0700 Subject: [PATCH 1/3] 1.0.72. --- kobalt/wrapper/kobalt-wrapper.properties | 2 +- src/main/resources/kobalt.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties index 9709019c..842b3300 100644 --- a/kobalt/wrapper/kobalt-wrapper.properties +++ b/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=1.0.71 \ No newline at end of file +kobalt.version=1.0.72 \ No newline at end of file diff --git a/src/main/resources/kobalt.properties b/src/main/resources/kobalt.properties index 3bb86711..4436f17d 100644 --- a/src/main/resources/kobalt.properties +++ b/src/main/resources/kobalt.properties @@ -1 +1 @@ -kobalt.version=1.0.71 +kobalt.version=1.0.72 From e1c1da55c6fb9add9e130ee21ad7e43b869bb461 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 20 Apr 2017 11:17:23 -0700 Subject: [PATCH 2/3] Fix duplication of parameters. --- src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt index d8a1d153..b14244c3 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt @@ -145,7 +145,6 @@ class KotlinCompiler @Inject constructor( // Collect the compiler args from kotlinCompiler{} and from settings.xml and parse them val args2 = info.compilerArgs + - (kotlinConfig(project)?.args ?: arrayListOf()) + (settings.kobaltCompilerFlags?.split(" ") ?: listOf()) val args = K2JVMCompilerArguments() val compiler = K2JVMCompiler() From 1342428eb0b19d5ec52f3a977497a80b1c0751ca Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 20 Apr 2017 11:17:28 -0700 Subject: [PATCH 3/3] Reformat. --- .../kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt index b14244c3..93ad5601 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt @@ -421,8 +421,10 @@ class KotlinCompiler @Inject constructor( val info = CompilerActionInfo(project?.directory, dependencies, sourceFiles, listOf("kt"), outputDir, args, friendPaths, context?.internalContext?.forceRecompile ?: false, compilerSeparateProcess) - return jvmCompiler.doCompile(project, context, compilerAction, info, - if (context != null) compilerUtils.sourceCompilerFlags(project, context, info) else emptyList()) + val compilerFlags = + if (context != null) compilerUtils.sourceCompilerFlags(project, context, info) + else emptyList() + return jvmCompiler.doCompile(project, context, compilerAction, info, compilerFlags) } }