Backend: Detekt Fixes Part 5 (#2617)

1 files changed, 30 insertions, 25 deletions

diff --git a/build.gradle.kts b/build.gradle.kts
index 3e3b002ff..cb384b269 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,6 +6,8 @@ import at.skyhanni.sharedvariables.versionString
 import net.fabricmc.loom.task.RunGameTask
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import io.gitlab.arturbosch.detekt.Detekt
+import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
 
 plugins {
     idea
@@ -348,28 +350,31 @@ publishing.publications {
     }
 }
 
-// Detekt: TODO: Uncomment this when we're ready to enforce
-// detekt {
-//     buildUponDefaultConfig = true // preconfigure defaults
-//     config.setFrom(rootProject.layout.projectDirectory.file("detekt/detekt.yml")) // point to your custom config defining rules to run, overwriting default behavior
-//     baseline = file(layout.projectDirectory.file("detekt/baseline.xml")) // a way of suppressing issues before introducing detekt
-//     source.setFrom(project.sourceSets.named("main").map { it.allSource })
-// }
-//
-// tasks.withType<Detekt>().configureEach {
-//     reports {
-//         html.required.set(true) // observe findings in your browser with structure and code snippets
-//         xml.required.set(true) // checkstyle like format mainly for integrations like Jenkins
-//         sarif.required.set(true) // standardized SARIF format (https://sarifweb.azurewebsites.net/) to support integrations with GitHub Code Scanning
-//         md.required.set(true) // simple Markdown format
-//     }
-// }
-//
-// tasks.withType<Detekt>().configureEach {
-//     jvmTarget = target.minecraftVersion.formattedJavaLanguageVersion
-//     outputs.cacheIf { false } // Custom rules won't work if cached
-// }
-// tasks.withType<DetektCreateBaselineTask>().configureEach {
-//     jvmTarget = target.minecraftVersion.formattedJavaLanguageVersion
-//     outputs.cacheIf { false } // Custom rules won't work if cached
-// }
+detekt {
+    buildUponDefaultConfig = true // preconfigure defaults
+    config.setFrom(rootProject.layout.projectDirectory.file("detekt/detekt.yml")) // point to your custom config defining rules to run, overwriting default behavior
+    baseline = file(layout.projectDirectory.file("detekt/baseline.xml")) // a way of suppressing issues before introducing detekt
+    source.setFrom(project.sourceSets.named("main").map { it.allSource })
+}
+
+tasks.withType<Detekt>().configureEach {
+    onlyIf {
+        false // TODO: Remove onlyIf when we're ready to enforce
+    }
+
+    reports {
+        html.required.set(true) // observe findings in your browser with structure and code snippets
+        xml.required.set(true) // checkstyle like format mainly for integrations like Jenkins
+        sarif.required.set(true) // standardized SARIF format (https://sarifweb.azurewebsites.net/) to support integrations with GitHub Code Scanning
+        md.required.set(true) // simple Markdown format
+    }
+}
+
+tasks.withType<Detekt>().configureEach {
+    jvmTarget = target.minecraftVersion.formattedJavaLanguageVersion
+    outputs.cacheIf { false } // Custom rules won't work if cached
+}
+tasks.withType<DetektCreateBaselineTask>().configureEach {
+    jvmTarget = target.minecraftVersion.formattedJavaLanguageVersion
+    outputs.cacheIf { false } // Custom rules won't work if cached
+}