Spotless and Detekt fix

Signed-off-by: Gopal S Akshintala <[email protected]>

Author: overfullstack

.idea/cody_history.xml

@@ -7,7 +7,6 @@
  */
 import io.freefair.gradle.plugins.lombok.LombokExtension.LOMBOK_VERSION
 import io.gitlab.arturbosch.detekt.Detekt
-import io.gitlab.arturbosch.detekt.DetektPlugin
 import io.gitlab.arturbosch.detekt.report.ReportMergeTask
 
 plugins {
@@ -21,26 +20,26 @@ plugins {
 
 allprojects { apply(plugin = "vador.root-conventions") }
 
-koverReport { defaults { xml { onCheck = true } } }
+kover { reports { total { html { onCheck = true } } } }
 
 dependencies { subprojects.forEach { kover(project(":${it.name}")) } }
 
 val detektReportMerge by
   tasks.registering(ReportMergeTask::class) {
-    output.set(rootProject.layout.buildDirectory.file("reports/detekt/merge.xml"))
+    output = project.layout.buildDirectory.file("reports/detekt/merge.sarif")
   }
 
 subprojects {
   apply(plugin = "vador.sub-conventions")
   apply(plugin = "vador.kt-conventions")
   apply(plugin = "vador.publishing-conventions")
-  tasks.withType<Detekt>().configureEach { reports { xml.required = true } }
-  plugins.withType<DetektPlugin> {
-    tasks.withType<Detekt> detekt@{
+  tasks {
+    withType<Detekt>().configureEach {
       finalizedBy(detektReportMerge)
-      detektReportMerge.configure { input.from(this@detekt.xmlReportFile) }
+      reports { sarif.required = true }
     }
   }
+  detektReportMerge { input.from(tasks.withType<Detekt>().map { it.sarifReportFile }) }
   val lombokForSonarQube: Configuration by configurations.creating
   dependencies { lombokForSonarQube("org.projectlombok:lombok:$LOMBOK_VERSION") }
   sonarqube {

build.gradle.kts

@@ -1,6 +1,5 @@
 import com.adarshr.gradle.testlogger.theme.ThemeType.MOCHA
-import com.diffplug.spotless.LineEnding
-import com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep.XML
+import com.diffplug.spotless.LineEnding.PLATFORM_NATIVE
 
 plugins {
   java
@@ -14,36 +13,30 @@ plugins {
 repositories { mavenCentral() }
 
 spotless {
-  lineEndings = LineEnding.PLATFORM_NATIVE
+  lineEndings = PLATFORM_NATIVE
   kotlin {
     ktfmt().googleStyle()
-    target("**/*.kt")
+    target("src/*/kotlin/**/*.kt", "src/*/java/**/*.kt")
     trimTrailingWhitespace()
     endWithNewline()
-    targetExclude("**/build/**", "**/.gradle/**", "**/generated/**", "**/bin/**", "**/out/**")
+    targetExclude("build/**", ".gradle/**", "generated/**", "bin/**", "out/**", "tmp/**")
   }
   kotlinGradle {
     ktfmt().googleStyle()
-    target("**/*.gradle.kts", "buildSrc/src/main/kotlin/**")
     trimTrailingWhitespace()
     endWithNewline()
-    targetExclude("**/build/**", "**/.gradle/**", "**/generated/**", "**/bin/**", "**/out/**")
+    targetExclude("build/**", ".gradle/**", "generated/**", "bin/**", "out/**", "tmp/**")
   }
   java {
     toggleOffOn()
-    target("**/*.java")
+    target("src/*/java/**/*.java")
     importOrder()
     removeUnusedImports()
     googleJavaFormat()
     trimTrailingWhitespace()
     indentWithSpaces(2)
     endWithNewline()
-    targetExclude("**/build/**", "**/.gradle/**", "**/generated/**", "**/bin/**", "**/out/**")
-  }
-  format("xml") {
-    target("*.xml")
-    eclipseWtp(XML)
-    targetExclude("**/build/**", "**/.gradle/**", "**/generated/**", "**/bin/**", "**/out/**")
+    targetExclude("build/**", ".gradle/**", "generated/**", "bin/**", "out/**", "tmp/**")
   }
   format("documentation") {
     target("*.md", "*.adoc")
@@ -53,13 +46,6 @@ spotless {
   }
 }
 
-detekt {
-  parallel = true
-  buildUponDefaultConfig = true
-  baseline = file("$rootDir/detekt/baseline.xml")
-  config.setFrom(file("$rootDir/detekt/config.yml"))
-}
-
 testlogger.theme = MOCHA
 
 tasks {

buildSrc/src/main/kotlin/vador.root-conventions.gradle.kts

@@ -4,10 +4,19 @@ import org.gradle.kotlin.dsl.`java-library`
 plugins {
   `java-library`
   id("org.jetbrains.kotlinx.kover")
+  id("io.gitlab.arturbosch.detekt")
 }
 
 testing {
   suites {
     val test by getting(JvmTestSuite::class) { useJUnitJupiter("5.10.2") }
   }
 }
+
+detekt {
+  parallel = true
+  buildUponDefaultConfig = true
+  baseline = file("$rootDir/detekt/baseline.xml")
+  config.setFrom(file("$rootDir/detekt/config.yml"))
+  ignoreFailures = true
+}

buildSrc/src/main/kotlin/vador.sub-conventions.gradle.kts

@@ -1,5 +1,6 @@
 [versions]
-kotlin = "2.0.0-RC1"
+jdk = "11"
+kotlin = "2.0.0"
 java-vavr = "0.10.4"
 kotlin-vavr = "0.10.2"
 lombok-gradle = "8.4"
@@ -13,8 +14,8 @@ nexus-publish = "2.0.0-rc-1"
 apache-common-text-version = "1.11.0"
 
 # Common dependencies
-junit = "5.10.1"
-kover = "0.7.5"
+junit = "5.10.2"
+kover = "0.8.1"
 kotest = "5.8.0"
 assertj-core = "3.24.2"
 detekt = "1.23.4"