Skip to content

Commit cec8060

Browse files
woainikkJesusMcCloud
authored andcommitted
Kotlin User Projects: add kotlin_additional_cli_options and logging of all extra compiler flags (Kotlin#2997)
1 parent c84f8a4 commit cec8060

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

buildSrc/src/main/kotlin/global-compiler-options.gradle.kts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
import org.jetbrains.kotlin.gradle.tasks.*
66
import kotlin.collections.joinToString
77

8-
val kotlin_additional_cli_options = providers.gradleProperty("kotlin_additional_cli_options")
9-
.map { it.split(" ") }
10-
.orNull
8+
val kotlinAdditionalCliOptions = providers.gradleProperty("kotlin_additional_cli_options")
9+
.orNull?.let { options ->
10+
options.removeSurrounding("\"").split(" ").filter { it.isNotBlank() }
11+
}
1112

1213
val globalCompilerArgs
1314
get() = listOf(
@@ -22,10 +23,7 @@ tasks.withType(KotlinCompilationTask::class).configureEach {
2223
compilerOptions {
2324
// Unconditional compiler options
2425
freeCompilerArgs.addAll(globalCompilerArgs)
25-
26-
if (kotlin_additional_cli_options != null) {
27-
freeCompilerArgs.addAll(kotlin_additional_cli_options)
28-
}
26+
kotlinAdditionalCliOptions?.forEach { option -> freeCompilerArgs.add(option) }
2927

3028
val isMainTaskName = name.startsWith("compileKotlin")
3129
if (isMainTaskName) {

0 commit comments

Comments
 (0)