Skip to content

Adopt KUP requirements imposed by KT-75078 #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 6, 2025
Merged

Adopt KUP requirements imposed by KT-75078 #214

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c87d4c
Adopt KUP requirements imposed by KT-75078
fzhinkin Mar 27, 2025
123615b
Log when kotlin_Werror_override is set to false
fzhinkin Apr 23, 2025
216cd0a
Support kotlin_additional_cli_options
fzhinkin Apr 23, 2025
fca9af3
Use the same logging format as kotlinx-serialization does
fzhinkin Apr 23, 2025
9e803b1
fixup! Support kotlin_additional_cli_options
fzhinkin Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 33 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,29 @@ allprojects {
}
}

val setAllWarningsAsError = providers.gradleProperty("kotlin_Werror_override").map {
when (it) {
"enable" -> true
"disable" -> false
else -> error("Unexpected value for 'kotlin_Werror_override' property: $it")
}
}

tasks.withType(KotlinCompilationTask::class).configureEach {
compilerOptions {
allWarningsAsErrors = true
freeCompilerArgs.add("-Xexpect-actual-classes")
if (setAllWarningsAsError.orNull != false) {
allWarningsAsErrors = true
} else {
freeCompilerArgs.addAll(
"-Wextra",
"-Xuse-fir-experimental-checkers"
)
}
freeCompilerArgs.addAll(
"-Xexpect-actual-classes",
"-Xreport-all-warnings",
"-Xrender-internal-diagnostic-names"
)
}
if (this is KotlinJsCompile) {
compilerOptions {
Expand All @@ -60,6 +79,18 @@ allprojects {
freeCompilerArgs.add("-Xjvm-default=disable")
}
}

val extraOpts = providers.gradleProperty("kotlin_additional_cli_options").orNull
extraOpts?.split(' ')?.map(String::trim)?.filter(String::isNotBlank)?.let { opts ->
if (opts.isNotEmpty()) {
compilerOptions.freeCompilerArgs.addAll(opts)
}
}

doFirst {
logger.info("Added Kotlin compiler flags: ${compilerOptions.freeCompilerArgs.get().joinToString(", ")}")
logger.info("allWarningsAsErrors=${compilerOptions.allWarningsAsErrors.get()}")
}
}
}

Expand Down