Move detekt-gradle-plugin to be a composite build (#4751)

detekt · Apr 25, 2022 · 0380716 · 0380716 · vercel · Apr 25, 2022
1 parent a6279ab
commit 0380716
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 17 deletions.
diff --git a/.github/workflows/pre-merge.yaml b/.github/workflows/pre-merge.yaml
@@ -82,4 +82,4 @@ jobs:
       - name: Build and compile test snippets
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: test -x :detekt-gradle-plugin:test -Pcompile-test-snippets=true
+          arguments: test -Pcompile-test-snippets=true
diff --git a/build-logic/src/main/kotlin/releasing.gradle.kts b/build-logic/src/main/kotlin/releasing.gradle.kts
@@ -69,12 +69,4 @@ tasks {
         linePartToFind.set("    detektVersion:")
         lineTransformation.set("    detektVersion: '${Versions.DETEKT}'")
     }
-
-    register<UpdateVersionInFileTask>("applySelfAnalysisVersion") {
-        fileToUpdate.set(file("${rootProject.rootDir}/gradle/libs.versions.toml"))
-        linePartToFind.set("detekt = { id = \"io.gitlab.arturbosch.detekt\"")
-        lineTransformation.set(
-            "detekt = { id = \"io.gitlab.arturbosch.detekt\", version = \"${Versions.DETEKT}\" }"
-        )
-    }
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,7 @@ import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
 
 plugins {
     id("releasing")
-    alias(libs.plugins.detekt)
+    id("io.gitlab.arturbosch.detekt")
     alias(libs.plugins.gradleVersions)
     alias(libs.plugins.sonarqube)
 }
@@ -105,3 +105,7 @@ val detektProjectBaseline by tasks.registering(DetektCreateBaselineTask::class)
     exclude(buildFiles)
     baseline.set(baselineFile)
 }
+
+tasks.register("build") {
+    dependsOn(gradle.includedBuild("detekt-gradle-plugin").task(":build"))
+}
diff --git a/detekt-gradle-plugin/build.gradle.kts b/detekt-gradle-plugin/build.gradle.kts
@@ -9,15 +9,14 @@ plugins {
     alias(libs.plugins.pluginPublishing)
 }
 
-detekt {
-    source.from("src/functionalTest/kotlin")
-}
-
 repositories {
     mavenCentral()
     google()
 }
 
+group = "io.gitlab.arturbosch.detekt"
+version = Versions.currentOrSnapshot()
+
 testing {
     suites {
         getByName("test", JvmTestSuite::class) {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -39,7 +39,6 @@ jcommander = "com.beust:jcommander:1.82"
 
 [plugins]
 binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.9.0" }
-detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.20.0" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 gradleVersions = { id = "com.github.ben-manes.versions", version = "0.42.0" }
 pluginPublishing = { id = "com.gradle.plugin-publish", version = "0.21.0" }

diff --git a/scripts/release.sh b/scripts/release.sh
@@ -4,5 +4,5 @@ gradle build || exit
 gradle publishAllPublicationsToMavenCentralRepository --max-workers 1 || exit
 gradle publishPlugins -DautomatePublishing=true || exit
 gradle githubRelease || exit
-gradle applyDocVersion applySelfAnalysisVersion || exit
+gradle applyDocVersion || exit
 gradle closeAndReleaseRepository || exit
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -4,6 +4,7 @@ rootProject.name = "detekt"
 
 pluginManagement {
     includeBuild("build-logic")
+    includeBuild("detekt-gradle-plugin")
 }
 
 include("code-coverage-report")
@@ -12,7 +13,6 @@ include("detekt-cli")
 include("detekt-core")
 include("detekt-formatting")
 include("detekt-generator")
-include("detekt-gradle-plugin")
 include("detekt-metrics")
 include("detekt-parser")
 include("detekt-psi-utils")