From 8949f47781d3ee44e2702a31906f339ace989d0a Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 13 Apr 2023 23:02:15 +0800
Subject: [PATCH] Cleanups

---
 runners/gradle-plugin/build.gradle.kts | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/runners/gradle-plugin/build.gradle.kts b/runners/gradle-plugin/build.gradle.kts
index d7c87d9d91..ea75d440cb 100644
--- a/runners/gradle-plugin/build.gradle.kts
+++ b/runners/gradle-plugin/build.gradle.kts
@@ -50,20 +50,28 @@ gradlePlugin {
     vcsUrl.set("https://github.com/kotlin/dokka.git")
 
     plugins {
-        all {
+        create("dokkaGradlePlugin") {
             id = "org.jetbrains.dokka"
             implementationClass = "org.jetbrains.dokka.gradle.DokkaPlugin"
-            tags.set(listOf("dokka", "kotlin", "kdoc", "android", "documentation"))
-        }
-        create("dokkaGradlePlugin") {
             displayName = "Dokka plugin"
             description = "Dokka, the Kotlin documentation tool"
+            tags.set(listOf("dokka", "kotlin", "kdoc", "android", "documentation"))
             isAutomatedPublishing = true
         }
-        register("dokkaGradlePluginForIntegrationTests") {
+    }
+}
+
+publishing {
+    publications {
+        register<MavenPublication>("dokkaGradlePluginForIntegrationTests") {
+            artifactId = "dokka-gradle-plugin"
+            from(components["java"])
             version = "for-integration-tests-SNAPSHOT"
         }
-        register("pluginMaven")
+
+        register<MavenPublication>("pluginMaven") {
+            artifactId = "dokka-gradle-plugin"
+        }
     }
 }
 
@@ -76,8 +84,8 @@ tasks.withType<PublishToMavenRepository>().configureEach {
 }
 
 afterEvaluate { // Workaround for an interesting design choice https://github.com/gradle/gradle/blob/c4f935f77377f1783f70ec05381c8182b3ade3ea/subprojects/plugin-development/src/main/java/org/gradle/plugin/devel/plugins/MavenPluginPublishPlugin.java#L49
-    configureSpacePublicationIfNecessary("pluginMaven")
-    configureSonatypePublicationIfNecessary("pluginMaven")
+    configureSpacePublicationIfNecessary("pluginMaven", "dokkaGradlePluginPluginMarkerMaven")
+    configureSonatypePublicationIfNecessary("pluginMaven", "dokkaGradlePluginPluginMarkerMaven")
     createDokkaPublishTaskIfNecessary()
 }