From 5f48424f80448f8795ee96eaf5b81c73641af698 Mon Sep 17 00:00:00 2001
From: Matthew Haughton <3flex@users.noreply.github.com>
Date: Sun, 31 Jul 2022 14:52:53 +1000
Subject: [PATCH] Re-enable warnings as errors for detekt-gradle-plugin

Fixes #5037
---
 build-logic/src/main/kotlin/module.gradle.kts              | 7 +------
 .../io/gitlab/arturbosch/detekt/internal/DetektAndroid.kt  | 2 ++
 .../io/gitlab/arturbosch/detekt/internal/DetektJvm.kt      | 2 ++
 .../io/gitlab/arturbosch/detekt/internal/SharedTasks.kt    | 1 +
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build-logic/src/main/kotlin/module.gradle.kts b/build-logic/src/main/kotlin/module.gradle.kts
index d466c2dca02..0b612f99dcb 100644
--- a/build-logic/src/main/kotlin/module.gradle.kts
+++ b/build-logic/src/main/kotlin/module.gradle.kts
@@ -56,12 +56,7 @@ tasks.withType<KotlinCompile>().configureEach {
             "-progressive",
             "-Xsuppress-version-warnings",
         )
-        // Note: Currently there are warnings for detekt-gradle-plugin that seemingly can't be fixed
-        //       until Gradle releases an update (https://github.com/gradle/gradle/issues/16345)
-        allWarningsAsErrors = when (project.name) {
-            "detekt-gradle-plugin" -> false
-            else -> project.findProperty("warningsAsErrors") == "true"
-        }
+        allWarningsAsErrors = project.findProperty("warningsAsErrors") == "true"
     }
 }
 
diff --git a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektAndroid.kt b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektAndroid.kt
index 0cdfe0b2d37..cce07fc6e0c 100644
--- a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektAndroid.kt
+++ b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektAndroid.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package io.gitlab.arturbosch.detekt.internal
 
 import com.android.build.gradle.AppExtension
diff --git a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektJvm.kt b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektJvm.kt
index 36bbab2d135..0742e21aca9 100644
--- a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektJvm.kt
+++ b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektJvm.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 package io.gitlab.arturbosch.detekt.internal
 
 import io.gitlab.arturbosch.detekt.DetektPlugin
diff --git a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/SharedTasks.kt b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/SharedTasks.kt
index e62b534ca52..f9431ae6e84 100644
--- a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/SharedTasks.kt
+++ b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/SharedTasks.kt
@@ -12,6 +12,7 @@ internal fun Project.registerDetektTask(
     configuration: Detekt.() -> Unit
 ): TaskProvider<Detekt> =
     tasks.register(name, Detekt::class.java) {
+        @Suppress("DEPRECATION")
         with(extension.reports) {
             if (xml.outputLocation.isPresent) {
                 logger.warn(