chore: fix dependencies between publishing tasks

esensar · Dec 24, 2024 · 607759f · 607759f
1 parent 2f36e8e
commit 607759f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -42,23 +42,23 @@ allprojects {
 
 subprojects {
     afterEvaluate {
-        val dokkaHtml = tasks["dokkaHtml"]
-        tasks {
-            create<Jar>("javadocJar") {
-                dependsOn(dokkaHtml)
-                archiveClassifier.set("javadoc")
-                from(dokkaHtml)
-            }
-        }
-
         configure<SigningExtension> {
             isRequired = false
             sign(extensions.getByType<PublishingExtension>().publications)
         }
 
         configure<PublishingExtension> {
             publications.withType(MavenPublication::class) {
-                artifact(tasks["javadocJar"])
+                val publication = this
+                val dokkaHtml = tasks["dokkaGenerate"]
+                val javadocJar =
+                    tasks.register<Jar>("${publication.name}JavadocJar") {
+                        dependsOn(dokkaHtml)
+                        archiveClassifier.set("javadoc")
+                        archiveBaseName.set("${archiveBaseName.get()}-${publication.name}")
+                        from(dokkaHtml)
+                    }
+                artifact(javadocJar)
                 pom {
                     name.set("Kotlinx Serialization MsgPack")
                     description.set("MsgPack format support for kotlinx.serialization")

diff --git a/gradle.properties b/gradle.properties
@@ -2,6 +2,8 @@ kotlin.code.style=official
 kotlin.incremental.multiplatform=true
 kotlin.js.generate.executable.default=false
 kotlin.native.ignoreDisabledTargets=true
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
 
 org.gradle.vfs.watch=true
 org.gradle.parallel=true