Merge pull request #716 from modelix/feature/MODELIX-794-avoid-custom-detekt-rules

build: replace custom detekt rules with official ones

Author: languitar

.detekt.yml

@@ -1,3 +1,6 @@
+config:
+  validation: true
+
 style:
   # handled by ktlint
   MaxLineLength:
@@ -26,7 +29,3 @@ comments:
 potential-bugs:
   CastNullableToNonNullableType:
     active: true
-
-modelix:
-  AvoidNonNullAssertionOperator:
-    active: true

.github/workflows/build.yaml

@@ -32,7 +32,7 @@ jobs:
       - name: Build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew --build-cache build detekt detektJsMain detektJsTest detektJvmMain detektJvmTest :koverHtmlReport :koverXmlReport -PciBuild=true
+        run: ./gradlew --build-cache build detektMain detektTest detektJsMain detektJsTest detektJvmMain detektJvmTest :koverHtmlReport :koverXmlReport -PciBuild=true
       - name: Publish test results
         uses: EnricoMi/publish-unit-test-result-action@v2
         # Also report in case the build failed

build.gradle.kts

@@ -153,26 +153,20 @@ subprojects {
     }
 
     // Configure detekt including our custom rule sets
-    if (project.name != "detekt-rules") {
-        apply(plugin = "io.gitlab.arturbosch.detekt")
-        dependencies {
-            detektPlugins(project(":detekt-rules"))
+    apply(plugin = "io.gitlab.arturbosch.detekt")
+    tasks.withType<Detekt> {
+        reports {
+            sarif.required.set(true)
+            html.required.set(true)
         }
-        tasks.withType<Detekt> {
-            dependsOn(":detekt-rules:assemble")
-
-            parallel = true
-            // For now, we only use the results here as hints
-            ignoreFailures = true
-
-            buildUponDefaultConfig = true
-            config.setFrom(parentProject.projectDir.resolve(".detekt.yml"))
+    }
+    detekt {
+        parallel = true
+        // For now, we only use the results here as hints
+        ignoreFailures = true
 
-            reports {
-                sarif.required.set(true)
-                html.required.set(true)
-            }
-        }
+        buildUponDefaultConfig = true
+        config.setFrom(parentProject.projectDir.resolve(".detekt.yml"))
     }
 }
 

detekt-rules/build.gradle.kts

@@ -10,7 +10,7 @@ group = "org.modelix.mps"
 dependencies {
     implementation(project(":model-api-gen-runtime"))
     implementation(project(":model-api-gen"))
-    compileOnly(fileTree(mpsHomeDir.map { it.dir("lib") }))
+    compileOnly(fileTree(mpsHomeDir.map { it.dir("lib") }).matching { include("**/*.jar") })
     compileOnly(
         mpsHomeDir.map {
             it.files(