From 7ff409fdf621932590dbf0118fff2c73dc76b951 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Tue, 14 Jul 2020 10:06:04 +0200
Subject: Adapt changes from "Simplify publishing configuration and enable
 sourcejars"

---
 runners/cli/build.gradle.kts           |  8 ++++++--
 runners/gradle-plugin/build.gradle.kts |  4 +---
 runners/maven-plugin/build.gradle.kts  | 11 ++++++++---
 3 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'runners')

diff --git a/runners/cli/build.gradle.kts b/runners/cli/build.gradle.kts
index 19a49346..4ad34192 100644
--- a/runners/cli/build.gradle.kts
+++ b/runners/cli/build.gradle.kts
@@ -1,4 +1,5 @@
-import org.jetbrains.configurePublication
+import org.jetbrains.DokkaPublicationBuilder.Component.Shadow
+import org.jetbrains.registerDokkaArtifactPublication
 
 plugins {
     id("com.github.johnrengelman.shadow")
@@ -26,5 +27,8 @@ tasks {
     }
 }
 
-configurePublication("dokka-cli", useShadow = true)
+registerDokkaArtifactPublication("dokkaCli"){
+    artifactId = "dokka-cli"
+    component = Shadow
+}
 
diff --git a/runners/gradle-plugin/build.gradle.kts b/runners/gradle-plugin/build.gradle.kts
index 00e3602e..0222f5e0 100644
--- a/runners/gradle-plugin/build.gradle.kts
+++ b/runners/gradle-plugin/build.gradle.kts
@@ -47,15 +47,13 @@ gradlePlugin {
 
 publishing {
     publications {
-        maybeCreate<MavenPublication>("pluginMaven").apply {
+        register<MavenPublication>("pluginMaven") {
             artifactId = "dokka-gradle-plugin"
-            artifact(sourceJar.get())
         }
 
         register<MavenPublication>("dokkaGradlePluginForIntegrationTests") {
             artifactId = "dokka-gradle-plugin"
             from(components["java"])
-            artifact(sourceJar.get())
             version = "for-integration-tests-SNAPSHOT"
         }
     }
diff --git a/runners/maven-plugin/build.gradle.kts b/runners/maven-plugin/build.gradle.kts
index 83d9f5af..fbd2b48a 100644
--- a/runners/maven-plugin/build.gradle.kts
+++ b/runners/maven-plugin/build.gradle.kts
@@ -1,6 +1,6 @@
 import org.jetbrains.CrossPlatformExec
 import org.jetbrains.SetupMaven
-import org.jetbrains.configurePublication
+import org.jetbrains.registerDokkaArtifactPublication
 
 val setupMaven by tasks.register<SetupMaven>("setupMaven")
 
@@ -45,7 +45,10 @@ val generatePom by tasks.registering(Copy::class) {
             line.replace("<version>dokka_version</version>", "<version>$dokka_version</version>")
         }
         filter { line ->
-            line.replace("<version>maven-plugin-plugin</version>", "<version>${setupMaven.mavenPluginToolsVersion}</version>")
+            line.replace(
+                "<version>maven-plugin-plugin</version>",
+                "<version>${setupMaven.mavenPluginToolsVersion}</version>"
+            )
         }
     }
 }
@@ -90,4 +93,6 @@ tasks.named<Jar>("jar") {
     }
 }
 
-configurePublication("dokka-maven-plugin")
+registerDokkaArtifactPublication("dokkaMavenPlugin") {
+    artifactId = "dokka-maven-plugin"
+}
-- 
cgit