Merge pull request #4 from vichid/fix-plugin

Fix plugin

Author: vichid

build-plugin/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("maven-publish")
-    id("java-gradle-plugin")
+    `maven-publish`
+    `kotlin-dsl`
 }
 
 java {

build-plugin/src/main/kotlin/io/github/vichid/DetektConfiguration.kt

@@ -1,7 +1,10 @@
 package io.github.vichid
 
 import io.gitlab.arturbosch.detekt.Detekt
-import io.gitlab.arturbosch.detekt.extensions.DetektExtension
+import io.gitlab.arturbosch.detekt.extensions.DetektExtension.Companion.DEFAULT_SRC_DIR_JAVA
+import io.gitlab.arturbosch.detekt.extensions.DetektExtension.Companion.DEFAULT_SRC_DIR_KOTLIN
+import io.gitlab.arturbosch.detekt.extensions.DetektExtension.Companion.DEFAULT_TEST_SRC_DIR_JAVA
+import io.gitlab.arturbosch.detekt.extensions.DetektExtension.Companion.DEFAULT_TEST_SRC_DIR_KOTLIN
 import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalog
 import org.gradle.api.artifacts.VersionCatalogsExtension
@@ -30,17 +33,17 @@ object DetektConfiguration {
             }
             tasks.withType<Detekt>().configureEach {
                 config.setFrom(file("$rootDir/config/detekt/detekt.yml"))
-                buildUponDefaultConfig = true
+                allRules = true
                 reports {
                     xml.required.set(true)
                     sarif.required.set(true)
                 }
                 source(
                     objects.fileCollection().from(
-                        DetektExtension.DEFAULT_SRC_DIR_JAVA,
-                        DetektExtension.DEFAULT_TEST_SRC_DIR_JAVA,
-                        DetektExtension.DEFAULT_SRC_DIR_KOTLIN,
-                        DetektExtension.DEFAULT_TEST_SRC_DIR_KOTLIN,
+                        DEFAULT_SRC_DIR_JAVA,
+                        DEFAULT_TEST_SRC_DIR_JAVA,
+                        DEFAULT_SRC_DIR_KOTLIN,
+                        DEFAULT_TEST_SRC_DIR_KOTLIN,
                     )
                 )
                 finalizedBy(reportXmlMerge)
@@ -51,7 +54,7 @@ object DetektConfiguration {
                 project.extensions.getByType<VersionCatalogsExtension>().named("libs")
             dependencies {
                 "detektPlugins"(libs.findLibrary("detekt.formatting").get().get())
-                "detektPlugins"(libs.findLibrary("detekt.custom.rules").get().get())
+                "detektPlugins"(libs.findLibrary("detekt.customRules").get().get())
             }
         }
 }

gradle/libs.versions.toml

@@ -1,10 +1,9 @@
 [versions]
 detekt = "1.21.0-RC2"
-detekt-custom-rules = "0.0.1"
+detekt-customRules = "0.1.0"
 gradlePlugins-android = "7.2.1"
 gradlePlugins-anvil = "2.4.1"
 gradlePlugins-autoManifest = "2.0"
-gradlePlugins-buildLogic = "0.0.26"
 gradlePlugins-dependencyAnalysis = "1.10.0"
 gradlePlugins-doctor = "0.8.1"
 gradlePlugins-junit5 = "1.8.2.1"
@@ -20,10 +19,11 @@ moshi-kotlin = "1.13.0"
 
 [libraries]
 detekt-api = { module = "io.gitlab.arturbosch.detekt:detekt-api", version.ref = "detekt" }
+detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
+detekt-customRules = { module = "io.github.vichid:detekt.rules", version.ref = "detekt-customRules" }
 gradlePlugins-android = { module = "com.android.tools.build:gradle", version.ref = "gradlePlugins-android" }
 gradlePlugins-anvil = { module = "com.squareup.anvil:gradle-plugin", version.ref = "gradlePlugins-anvil" }
 gradlePlugins-autoManifest = { module = "com.gradleup:auto-manifest-plugin", version.ref = "gradlePlugins-autoManifest" }
-gradlePlugins-buildLogic = { module = "io.github.vichid:build-logic", version.ref = "gradlePlugins-buildLogic" }
 gradlePlugins-dependencyAnalysis = { module = "com.autonomousapps:dependency-analysis-gradle-plugin", version.ref = "gradlePlugins-dependencyAnalysis" }
 gradlePlugins-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
 gradlePlugins-doctor = { module = "com.osacky.doctor:doctor-plugin", version.ref = "gradlePlugins-doctor" }