Cleanup Gradle Plugin Pubblications

.github/workflows/pre-merge.yaml

@@ -48,6 +48,10 @@ jobs:
       uses: gradle/gradle-build-action@v2
       with:
         arguments: :detekt-cli:runWithArgsFile
+    - name: Try to publish everything to Maven Local
+      uses: gradle/gradle-build-action@v2
+      with:
+        arguments: publishAllToMavenLocal
 
   verify-generated-config-file:
     if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}

build-logic/src/main/kotlin/packaging.gradle.kts

@@ -27,31 +27,34 @@ publishing {
             }
         }
     }
-    publications.register<MavenPublication>(DETEKT_PUBLICATION) {
-        groupId = "io.gitlab.arturbosch.detekt"
-        artifactId = project.name
-        from(components["java"])
-        version = Versions.currentOrSnapshot()
-        pom {
-            description.set("Static code analysis for Kotlin")
-            name.set("detekt")
-            url.set("https://detekt.dev")
-            licenses {
-                license {
-                    name.set("The Apache Software License, Version 2.0")
-                    url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
-                    distribution.set("repo")
+    // We don't need to configure publishing for the Gradle plugin.
+    if (project.name != "detekt-gradle-plugin") {
+        publications.register<MavenPublication>(DETEKT_PUBLICATION) {
+            groupId = "io.gitlab.arturbosch.detekt"
+            artifactId = project.name
+            from(components["java"])
+            version = Versions.currentOrSnapshot()
+            pom {
+                description.set("Static code analysis for Kotlin")
+                name.set("detekt")
+                url.set("https://detekt.dev")
+                licenses {
+                    license {
+                        name.set("The Apache Software License, Version 2.0")
+                        url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                        distribution.set("repo")
+                    }
                 }
-            }
-            developers {
-                developer {
-                    id.set("Artur Bosch")
-                    name.set("Artur Bosch")
-                    email.set("arturbosch@gmx.de")
+                developers {
+                    developer {
+                        id.set("Artur Bosch")
+                        name.set("Artur Bosch")
+                        email.set("arturbosch@gmx.de")
+                    }
+                }
+                scm {
+                    url.set("https://github.com/detekt/detekt")
                 }
-            }
-            scm {
-                url.set("https://github.com/detekt/detekt")
             }
         }
     }

build.gradle.kts

@@ -113,3 +113,33 @@ tasks.register("buildAll") {
     }
     dependsOn(gradle.includedBuild("detekt-gradle-plugin").task(":build"))
 }
+
+tasks.register("publishAllToMavenLocal") {
+    description = "Publish all the projects to Maven Local"
+    subprojects {
+        if (this.plugins.hasPlugin("publishing")) {
+            dependsOn(tasks.named("publishToMavenLocal"))
+        }
+    }
+    dependsOn(gradle.includedBuild("detekt-gradle-plugin").task(":publishToMavenLocal"))
+}
+
+tasks.register("publishAllToSonatypeSnapshot") {
+    description = "Publish all the projects to Sonatype Snapshot Repository"
+    subprojects {
+        if (this.plugins.hasPlugin("publishing")) {
+            dependsOn(tasks.named("publishAllPublicationsToSonatypeSnapshotRepository"))
+        }
+    }
+    dependsOn(gradle.includedBuild("detekt-gradle-plugin").task(":publishAllPublicationsToSonatypeSnapshotRepository"))
+}
+
+tasks.register("publishAllToMavenCentral") {
+    description = "Publish all the projects to Sonatype Staging Repository"
+    subprojects {
+        if (this.plugins.hasPlugin("publishing")) {
+            dependsOn(tasks.named("publishAllPublicationsToMavenCentralRepository"))
+        }
+    }
+    dependsOn(gradle.includedBuild("detekt-gradle-plugin").task(":publishAllPublicationsToMavenCentralRepository"))
+}

detekt-gradle-plugin/build.gradle.kts

@@ -75,9 +75,6 @@ dependencies {
 }
 
 gradlePlugin {
-    // hack to prevent building two jar's overwriting each other and leading to invalid signatures
-    // when publishing the Gradle plugin, this property must be present
-    isAutomatedPublishing = System.getProperty("automatePublishing")?.toBoolean() ?: false
     plugins {
         register("detektPlugin") {
             id = "io.gitlab.arturbosch.detekt"

scripts/release.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env sh
-gradle buildAll publishToMavenLocal -x detekt -x test || exit
+gradle buildAll publishAllToMavenLocal -x detekt -x test || exit
 gradle buildAll || exit
-gradle publishAllPublicationsToMavenCentralRepository --max-workers 1 || exit
-gradle publishPlugins -DautomatePublishing=true || exit
+gradle publishAllToMavenCentral --max-workers 1 || exit
+gradle publishPlugins || exit
 gradle githubRelease || exit
 gradle applyDocVersion || exit
 gradle closeAndReleaseRepository || exit