Add kotlin.build.disable.werror to disable -Werror locally
This can be placed, for example, in `local.properties` to temporarily disable `-Werror` in compiler/stdlib/plugin/test modules during development.
This commit is contained in:
+1
-1
@@ -472,7 +472,7 @@ allprojects {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!kotlinBuildProperties.isInJpsBuildIdeaSync && !kotlinBuildProperties.useFir) {
|
if (!kotlinBuildProperties.isInJpsBuildIdeaSync && !kotlinBuildProperties.useFir && !kotlinBuildProperties.disableWerror) {
|
||||||
// For compiler and stdlib, allWarningsAsErrors is configured in the corresponding "root" projects
|
// For compiler and stdlib, allWarningsAsErrors is configured in the corresponding "root" projects
|
||||||
// (compiler/build.gradle.kts and libraries/commonConfiguration.gradle).
|
// (compiler/build.gradle.kts and libraries/commonConfiguration.gradle).
|
||||||
val projectsWithWarningsAsErrors = listOf("core", "plugins").map { File(it).absoluteFile }
|
val projectsWithWarningsAsErrors = listOf("core", "plugins").map { File(it).absoluteFile }
|
||||||
|
|||||||
@@ -18,3 +18,5 @@ val KotlinBuildProperties.proguard: Boolean get() = postProcessing && getBoolean
|
|||||||
val KotlinBuildProperties.jarCompression: Boolean get() = getBoolean("kotlin.build.jar.compression", isTeamcityBuild)
|
val KotlinBuildProperties.jarCompression: Boolean get() = getBoolean("kotlin.build.jar.compression", isTeamcityBuild)
|
||||||
|
|
||||||
val KotlinBuildProperties.ignoreTestFailures: Boolean get() = getBoolean("ignoreTestFailures", isTeamcityBuild)
|
val KotlinBuildProperties.ignoreTestFailures: Boolean get() = getBoolean("ignoreTestFailures", isTeamcityBuild)
|
||||||
|
|
||||||
|
val KotlinBuildProperties.disableWerror: Boolean get() = getBoolean("kotlin.build.disable.werror", isTeamcityBuild)
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
|
|||||||
idea {
|
idea {
|
||||||
this.module.generatedSourceDirs.add(generationRoot)
|
this.module.generatedSourceDirs.add(generationRoot)
|
||||||
}
|
}
|
||||||
} else if (!kotlinBuildProperties.useFir) {
|
} else if (!kotlinBuildProperties.useFir && !kotlinBuildProperties.disableWerror) {
|
||||||
allprojects {
|
allprojects {
|
||||||
tasks.withType<KotlinCompile<*>> {
|
tasks.withType<KotlinCompile<*>> {
|
||||||
if (path !in tasksWithWarnings) {
|
if (path !in tasksWithWarnings) {
|
||||||
|
|||||||
@@ -37,10 +37,12 @@ ext.configureJvm6Project = { Project project ->
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
project.tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinCompile.class) { task ->
|
if (!BuildPropertiesExtKt.getDisableWerror(project.kotlinBuildProperties)) {
|
||||||
if (!tasksWithWarnings.contains(task.path)) {
|
project.tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinCompile.class) { task ->
|
||||||
task.kotlinOptions {
|
if (!tasksWithWarnings.contains(task.path)) {
|
||||||
allWarningsAsErrors = true
|
task.kotlinOptions {
|
||||||
|
allWarningsAsErrors = true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user