p2: Detekt configuration clean up

android/build-logic/convention/build.gradle.kts

@@ -50,11 +50,6 @@ gradlePlugin {
             implementationClass = "com.theguardian.convention.ComposeApplicationConventionPlugin"
             version = "1"
         }
-        register("guardianDetektPlugin") {
-            id = "com.theguardian.detekt"
-            implementationClass = "com.theguardian.convention.DetektPlugin"
-            version = "1"
-        }
         register("androidTestPlugin") {
             id = "com.theguardian.test.android"
             implementationClass = "com.theguardian.convention.AndroidTestConventionPlugin"

android/build-logic/convention/gradle-lint-baseline.xml

@@ -1,15 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.7.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.2)" variant="all" version="8.7.2">
+<issues format="6" by="lint 8.7.3" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.3)" variant="all" version="8.7.3">
 
     <issue
         id="GradleProjectIsolation"
         message="Avoid using method getRootProject"
-        errorLine1="            val rootProject = target.rootProject"
-        errorLine2="                                     ~~~~~~~~~~~">
+        errorLine1="                rootProject.layout.buildDirectory.file(&quot;reports/detekt/merge.sarif&quot;),"
+        errorLine2="                ~~~~~~~~~~~">
         <location
-            file="src/main/kotlin/com/theguardian/convention/DetektPlugin.kt"
-            line="23"
-            column="38"/>
+            file="src/main/kotlin/com/theguardian/convention/shared/SetupDetekt.kt"
+            line="20"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="            basePath = rootProject.projectDir.absolutePath"
+        errorLine2="                       ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/com/theguardian/convention/shared/SetupDetekt.kt"
+            line="57"
+            column="24"/>
     </issue>
 
 </issues>

android/build-logic/convention/src/main/kotlin/com/theguardian/convention/AndroidApplicationConventionPlugin.kt

@@ -1,10 +1,7 @@
 package com.theguardian.convention
 
 import com.android.build.api.dsl.ApplicationExtension
-import com.theguardian.convention.shared.configureAndroidModule
-import com.theguardian.convention.shared.configureAndroidTests
-import com.theguardian.convention.shared.libs
-import com.theguardian.convention.shared.plugin
+import com.theguardian.convention.shared.*
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
@@ -29,6 +26,8 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
                 apply(libs.plugin("kotlinter").pluginId)
             }
 
+            setupDetekt()
+
             extensions.configure<ApplicationExtension> {
                 defaultConfig {
                     targetSdk = libs.findVersion("targetsdk").get().toString().toInt()

android/build-logic/convention/src/main/kotlin/com/theguardian/convention/AndroidLibraryConventionPlugin.kt

@@ -31,6 +31,8 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
                 apply(libs.plugin("kotlinter").pluginId)
             }
 
+            setupDetekt()
+
             extensions.configure<LibraryExtension> {
                 configureAndroidModule<KotlinAndroidProjectExtension>(this)
 

android/build-logic/convention/src/main/kotlin/com/theguardian/convention/AndroidTestConventionPlugin.kt

@@ -1,10 +1,7 @@
 package com.theguardian.convention
 
 import com.android.build.gradle.TestExtension
-import com.theguardian.convention.shared.configureAndroidModule
-import com.theguardian.convention.shared.configureAndroidTests
-import com.theguardian.convention.shared.libs
-import com.theguardian.convention.shared.plugin
+import com.theguardian.convention.shared.*
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
@@ -29,6 +26,8 @@ class AndroidTestConventionPlugin : Plugin<Project> {
                 apply(libs.plugin("kotlinter").pluginId)
             }
 
+            setupDetekt()
+
             extensions.configure<TestExtension> {
                 configureAndroidModule<KotlinAndroidProjectExtension>(this)
 

android/build-logic/convention/src/main/kotlin/com/theguardian/convention/KotlinLibraryConventionPlugin.kt

@@ -3,6 +3,7 @@ package com.theguardian.convention
 import com.theguardian.convention.shared.addBaseDependencies
 import com.theguardian.convention.shared.libs
 import com.theguardian.convention.shared.plugin
+import com.theguardian.convention.shared.setupDetekt
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
@@ -24,6 +25,8 @@ class KotlinLibraryConventionPlugin : Plugin<Project> {
                 apply(libs.plugin("kotlinter").pluginId)
             }
 
+            setupDetekt()
+
             addBaseDependencies<KotlinJvmProjectExtension>()
         }
     }

android/build-logic/convention/src/main/kotlin/com/theguardian/convention/shared/SetupDetekt.kt

@@ -0,0 +1,66 @@
+package com.theguardian.convention.shared
+
+import io.gitlab.arturbosch.detekt.Detekt
+import io.gitlab.arturbosch.detekt.extensions.DetektExtension
+import io.gitlab.arturbosch.detekt.report.ReportMergeTask
+import org.gradle.api.JavaVersion
+import org.gradle.api.Project
+
+/**
+ * The Detekt convention plugin applies detekt plugins, and sets up configuration based on settings.
+ */
+fun Project.setupDetekt() {
+    with(this) {
+        with(pluginManager) {
+            this.apply(libs.plugin("detekt").pluginId)
+        }
+
+        tasks.register("reportMerge", ReportMergeTask::class.java) {
+            output.set(
+                rootProject.layout.buildDirectory.file("reports/detekt/merge.sarif"),
+            )
+        }
+
+        val reportMerge = tasks.named("reportMerge", ReportMergeTask::class.java)
+
+        reportMerge.configure {
+            input.from(tasks.withType(Detekt::class.java).map { it.sarifReportFile })
+        }
+
+        // enable reports
+        tasks.withType(Detekt::class.java).configureEach {
+            jvmTarget = JavaVersion.VERSION_17.toString()
+            reports {
+                xml.required.set(false)
+                html.required.set(true)
+                txt.required.set(true)
+                md.required.set(false)
+
+                sarif.required.set(true)
+            }
+
+            exclude(
+                "**/build/*",
+                "**/generated/*",
+                "**/build.gradle.kts",
+                "**/settings.gradle.kts",
+            )
+
+            finalizedBy(reportMerge)
+        }
+
+        extensions.configure(DetektExtension::class.java) {
+            toolVersion = libs.findVersion("detekt").get().requiredVersion
+            config.setFrom(file("${rootDir}/config/detekt.yml"))
+            parallel = true
+
+            basePath = rootProject.projectDir.absolutePath
+            ignoredBuildTypes = listOf("release")
+
+            if (!isJvmModule()) {
+                // By default only main and test sources are included. I've added androidTest too
+                source.from("src/androidTest/java", "src/androidTest/kotlin")
+            }
+        }
+    }
+}

android/gradle/libs.versions.toml

@@ -107,5 +107,4 @@ guardian-library-android = { id = "com.theguardian.library.android", version.ref
 guardian-test-android = { id = "com.theguardian.test.android", version.ref = "guardian-convention-plugins" }
 guardian-library-kotlin = { id = "com.theguardian.library.kotlin", version.ref = "guardian-convention-plugins" }
 guardian-compose-library = { id = "com.theguardian.compose.library", version.ref = "guardian-convention-plugins" }
-guardian-compose-application = { id = "com.theguardian.compose.application", version.ref = "guardian-convention-plugins" }
-guardian-detekt = { id = "com.theguardian.detekt", version.ref = "guardian-convention-plugins" }
+guardian-compose-application = { id = "com.theguardian.compose.application", version.ref = "guardian-convention-plugins" }

android/sample/build.gradle.kts

@@ -1,7 +1,6 @@
 plugins {
     alias(libs.plugins.guardian.application)
     alias(libs.plugins.guardian.compose.application)
-    alias(libs.plugins.guardian.detekt)
 }
 
 android {

android/source/build.gradle.kts

@@ -3,7 +3,6 @@ plugins {
     signing
     alias(libs.plugins.guardian.library.android)
     alias(libs.plugins.guardian.compose.library)
-    alias(libs.plugins.guardian.detekt)
 }
 
 android {