From 8ae3c3f5f8ff6a8894ed5bac2be3fa4556834374 Mon Sep 17 00:00:00 2001
From: Roman Zavarnitsyn <rom4ek93@gmail.com>
Date: Wed, 5 Feb 2025 00:24:03 +0100
Subject: [PATCH] Fix publications for new locations

---
 buildSrc/src/main/java/Config.kt      |  2 +-
 buildSrc/src/main/java/Publication.kt | 29 +++++++++++++++------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
index 9aa31dce0f..f508b21b1d 100644
--- a/buildSrc/src/main/java/Config.kt
+++ b/buildSrc/src/main/java/Config.kt
@@ -26,7 +26,7 @@ object Config {
         val gretty = "org.gretty"
         val grettyVersion = "4.0.0"
         val gradleMavenPublishPlugin = "com.vanniktech.maven.publish"
-        val gradleMavenPublishPluginVersion = "0.28.0"
+        val gradleMavenPublishPluginVersion = "0.30.0"
         val dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:1.9.20"
         val dokkaPluginAlias = "org.jetbrains.dokka"
         val composeGradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$composeVersion"
diff --git a/buildSrc/src/main/java/Publication.kt b/buildSrc/src/main/java/Publication.kt
index 08a81c703f..bae398e27c 100644
--- a/buildSrc/src/main/java/Publication.kt
+++ b/buildSrc/src/main/java/Publication.kt
@@ -24,7 +24,10 @@ fun DistributionContainer.configureForMultiplatform(project: Project) {
         }
         from("build${sep}libs") {
             include("*android*")
-            withJavadoc(renameTo = "compose-android")
+            include("*androidRelease-javadoc*")
+            rename {
+                it.replace("androidRelease-javadoc", "android")
+            }
         }
     }
     this.getByName("main").contents {
@@ -38,8 +41,8 @@ fun DistributionContainer.configureForMultiplatform(project: Project) {
             rename {
                 it.replace("-kotlin", "")
                     .replace("-metadata", "")
+                    .replace("Multiplatform-javadoc", "")
             }
-            withJavadoc()
         }
     }
     this.maybeCreate("desktop").contents {
@@ -49,7 +52,10 @@ fun DistributionContainer.configureForMultiplatform(project: Project) {
         }
         from("build${sep}libs") {
             include("*desktop*")
-            withJavadoc(renameTo = "compose-desktop")
+            include("*desktop-javadoc*")
+            rename {
+                it.replace("desktop-javadoc", "desktop")
+            }
         }
     }
 
@@ -77,16 +83,13 @@ fun DistributionContainer.configureForJvm(project: Project) {
         from("build${sep}publications${sep}release") {
             renameModule(project.name, version = version)
         }
-    }
-}
-
-private fun CopySpec.withJavadoc(renameTo: String = "compose") {
-    include("*javadoc*")
-    rename {
-        if (it.contains("javadoc")) {
-            it.replace("compose", renameTo)
-        } else {
-            it
+        from("build${sep}intermediates${sep}java_doc_jar${sep}release") {
+            include("*javadoc*")
+            rename { it.replace("release", "${project.name}-$version") }
+        }
+        from("build${sep}intermediates${sep}source_jar${sep}release") {
+            include("*sources*")
+            rename { it.replace("release", "${project.name}-$version") }
         }
     }
 }