From 6c3c28df3af8e9d8889af9f7ad39506e03af7f69 Mon Sep 17 00:00:00 2001
From: Chao Zhang <chao.zhang@instacart.com>
Date: Mon, 21 Feb 2022 02:48:00 -0800
Subject: [PATCH] Housekeep Gradle scripts (#4589)

* Housekeep Gradle scripts

* Revert changes in settings.gradle
---
 build.gradle.kts | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index cfc13d875..2e4015978 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,19 +17,12 @@ allprojects {
     detekt {
         source = objects.fileCollection().from(
             io.gitlab.arturbosch.detekt.extensions.DetektExtension.DEFAULT_SRC_DIR_JAVA,
-            "src/test/java",
+            io.gitlab.arturbosch.detekt.extensions.DetektExtension.DEFAULT_TEST_SRC_DIR_JAVA,
             io.gitlab.arturbosch.detekt.extensions.DetektExtension.DEFAULT_SRC_DIR_KOTLIN,
-            "src/test/kotlin"
+            io.gitlab.arturbosch.detekt.extensions.DetektExtension.DEFAULT_TEST_SRC_DIR_KOTLIN,
         )
         buildUponDefaultConfig = true
         baseline = file("$rootDir/config/detekt/baseline.xml")
-
-        reports {
-            xml.enabled = true
-            html.enabled = true
-            txt.enabled = true
-            sarif.enabled = true
-        }
     }
 
     dependencies {
@@ -40,6 +33,12 @@ allprojects {
 
     tasks.withType<Detekt>().configureEach {
         jvmTarget = "1.8"
+        reports {
+            xml.required.set(true)
+            html.required.set(true)
+            txt.required.set(true)
+            sarif.required.set(true)
+        }
     }
     tasks.withType<DetektCreateBaselineTask>().configureEach {
         jvmTarget = "1.8"
@@ -70,9 +69,9 @@ val detektFormat by tasks.registering(Detekt::class) {
     exclude(buildFiles)
     baseline.set(baselineFile)
     reports {
-        xml.enabled = false
-        html.enabled = false
-        txt.enabled = false
+        xml.required.set(false)
+        html.required.set(false)
+        txt.required.set(false)
     }
 }
 
@@ -88,9 +87,9 @@ val detektAll by tasks.registering(Detekt::class) {
     exclude(buildFiles)
     baseline.set(baselineFile)
     reports {
-        xml.enabled = false
-        html.enabled = false
-        txt.enabled = false
+        xml.required.set(false)
+        html.required.set(false)
+        txt.required.set(false)
     }
 }