From 0fb398d45e1dee37b1fa48d320513c3601e819e6 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <alexander.udalov@jetbrains.com>
Date: Fri, 30 Jul 2021 17:55:13 +0200
Subject: [PATCH] Build: enable Werror for almost all compileKotlin tasks

The only exception at this point is :kotlin-gradle-plugin:compileKotlin.
---
 build.gradle.kts                              | 23 ++++---------------
 compiler/build.gradle.kts                     | 15 ------------
 .../kotlin/js/test/BasicIrBoxTest.kt          |  1 +
 3 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2e12cdfda79..953d17bde88 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -315,15 +315,7 @@ extra["compilerArtifactsForIde"] = listOf(
 
 // TODO: fix remaining warnings and remove this property.
 extra["tasksWithWarnings"] = listOf(
-    ":kotlin-stdlib:compileTestKotlin",
-    ":kotlin-stdlib-jdk7:compileTestKotlin",
-    ":kotlin-stdlib-jdk8:compileTestKotlin",
-    ":plugins:uast-kotlin-base:compileKotlin",
-    ":plugins:uast-kotlin-base:compileTestKotlin",
-    ":plugins:uast-kotlin:compileKotlin",
-    ":plugins:uast-kotlin:compileTestKotlin",
-    ":plugins:uast-kotlin-fir:compileKotlin",
-    ":plugins:uast-kotlin-fir:compileTestKotlin"
+    ":kotlin-gradle-plugin:compileKotlin"
 )
 
 val tasksWithWarnings: List<String> by extra
@@ -482,15 +474,10 @@ allprojects {
     }
 
     if (!kotlinBuildProperties.disableWerror) {
-        // For compiler and stdlib, allWarningsAsErrors is configured in the corresponding "root" projects
-        // (compiler/build.gradle.kts and libraries/commonConfiguration.gradle).
-        val projectsWithWarningsAsErrors = listOf("core", "plugins").map { File(it).absoluteFile }
-        if (projectsWithWarningsAsErrors.any(projectDir::startsWith)) {
-            tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile> {
-                if (path !in tasksWithWarnings) {
-                    kotlinOptions {
-                        allWarningsAsErrors = true
-                    }
+        tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile> {
+            if (path !in tasksWithWarnings) {
+                kotlinOptions {
+                    allWarningsAsErrors = true
                 }
             }
         }
diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index 8de809bba9b..18ad2e7f9b9 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
 import org.jetbrains.kotlin.ideaExt.idea
 import java.io.File
 
@@ -10,8 +9,6 @@ plugins {
 val compilerModules: Array<String> by rootProject.extra
 val otherCompilerModules = compilerModules.filter { it != path }
 
-val tasksWithWarnings: List<String> by rootProject.extra
-
 val antLauncherJar by configurations.creating
 
 dependencies {
@@ -68,18 +65,6 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
     }
 }
 
-if (!kotlinBuildProperties.disableWerror) {
-    allprojects {
-        tasks.withType<KotlinCompile<*>> {
-            if (path !in tasksWithWarnings) {
-                kotlinOptions {
-                    allWarningsAsErrors = true
-                }
-            }
-        }
-    }
-}
-
 projectTest(parallel = true) {
     dependsOn(":dist")
 
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt
index 3ea44734eaa..588c5e9fbd1 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt
@@ -173,6 +173,7 @@ abstract class BasicIrBoxTest(
 
             fun prepareModule(allowIc: Boolean): ModulesStructure {
                 val useIc = runIcMode && allowIc
+                @Suppress("NAME_SHADOWING")
                 val icCache = if (useIc) icCache else emptyMap()
                 return if (!klibMainModule) {
                     prepareAnalyzedSourceModule(