Bug 1805070 - Part 3: Sync Focus detekt configuration with AC

mozilla-mobile · May 19, 2023 · 475d011 · 475d011
1 parent 0b162b9
commit 475d011
Show file tree

Hide file tree

Showing 3 changed files with 201 additions and 147 deletions.
diff --git a/focus-android/build.gradle b/focus-android/build.gradle
@@ -35,11 +35,10 @@ buildscript {
 }
 
 plugins {
-    id "io.gitlab.arturbosch.detekt" version "1.19.0" // Variables in plugins {} aren't supported
+    id "io.gitlab.arturbosch.detekt" version "1.22.0" // Variables in plugins {} aren't supported
 }
 
 detekt {
-    buildUponDefaultConfig = true
     input = files("$projectDir/app")
     config = files("$projectDir/quality/detekt.yml")
     baseline = file("$projectDir/quality/detekt-baseline.xml")
@@ -49,9 +48,34 @@ detekt {
             enabled = true
             destination = file("$projectDir/build/reports/detekt.html")
         }
+        xml {
+            enabled = false
+        }
+        txt {
+            enabled = false
+        }
     }
 }
 
+tasks.withType(io.gitlab.arturbosch.detekt.Detekt).configureEach() {
+    autoCorrect = true
+
+    exclude "**/test/**"
+    exclude "**/androidTest/**"
+    exclude "**/build/**"
+    exclude "**/resources/**"
+    exclude "**/tmp/**"
+}
+
+// Apply same path exclusions as for the main task
+tasks.withType(io.gitlab.arturbosch.detekt.DetektCreateBaselineTask).configureEach() {
+    exclude "**/test/**"
+    exclude "**/androidTest/**"
+    exclude "**/build/**"
+    exclude "**/resources/**"
+    exclude "**/tmp/**"
+}
+
 allprojects {
     repositories {
         google()