Fix implicit dependency error in Gradle for publishing additional jav…

…adoc jar
jwstegemann · Jan 10, 2024 · 107771a · 107771a
1 parent e1eefb8
commit 107771a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 39 deletions.
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -63,13 +63,4 @@ kotlin {
     }
 }
 
-// Generates a javadoc jar from dokka html sources
-val dokkaJavadocJar by tasks.creating(Jar::class) {
-    group = JavaBasePlugin.DOCUMENTATION_GROUP
-    description = "Assembles java doc to jar"
-    archiveClassifier.set("javadoc")
-    dependsOn(tasks.dokkaHtml)
-    from(tasks.dokkaHtml.flatMap { it.outputDirectory })
-}
-
 apply(from = "$rootDir/publishing.gradle.kts")
diff --git a/headless/build.gradle.kts b/headless/build.gradle.kts
@@ -57,13 +57,4 @@ kotlin {
     }
 }
 
-// Generates a javadoc jar from dokka html sources
-val dokkaJavadocJar by tasks.creating(Jar::class) {
-    group = JavaBasePlugin.DOCUMENTATION_GROUP
-    description = "Assembles java doc to jar"
-    archiveClassifier.set("javadoc")
-    dependsOn(tasks.dokkaHtml)
-    from(tasks.dokkaHtml.flatMap { it.outputDirectory })
-}
-
 apply(from = "$rootDir/publishing.gradle.kts")
diff --git a/lenses-annotation-processor/build.gradle.kts b/lenses-annotation-processor/build.gradle.kts
@@ -44,13 +44,4 @@ kotlin {
     }
 }
 
-// Generates a javadoc jar from dokka html sources
-val dokkaJavadocJar by tasks.creating(Jar::class) {
-    group = JavaBasePlugin.DOCUMENTATION_GROUP
-    description = "Assembles java doc to jar"
-    archiveClassifier.set("javadoc")
-    dependsOn(tasks.dokkaHtml)
-    from(tasks.dokkaHtml.flatMap { it.outputDirectory })
-}
-
 apply(from = "$rootDir/publishing.gradle.kts")
diff --git a/publishing.gradle.kts b/publishing.gradle.kts
@@ -4,6 +4,20 @@ apply(plugin = "maven-publish")
 apply(plugin = "signing")
 apply(plugin = "org.jetbrains.dokka")
 
+// Workaround for Gradle issue
+// https://github.com/gradle/gradle/issues/26091
+tasks.withType<AbstractPublishToMaven>().configureEach {
+    dependsOn(tasks.withType<Sign>())
+}
+
+// Generates a javadoc jar from dokka html sources
+val javadocJar by tasks.creating(Jar::class) {
+    group = JavaBasePlugin.DOCUMENTATION_GROUP
+    description = "Assembles java doc to jar"
+    archiveClassifier.set("javadoc")
+    from(tasks.named("dokkaHtml"))
+}
+
 the<SigningExtension>().apply {
     val signingKey: String = System.getenv("GPG_SIGNING_KEY").orEmpty()
     val signingPassphrase: String = System.getenv("GPG_SIGNING_PASSPHRASE").orEmpty()
@@ -25,7 +39,7 @@ the<PublishingExtension>().apply {
 
             url = uri(if (isRelease && !version.toString().endsWith("SNAPSHOT")) releaseUrl else snapshotUrl)
             // for local testing
-//            url = uri(layout.buildDirectory.dir("repo"))
+            // url = uri(layout.buildDirectory.dir("repo"))
 
             credentials {
                 username = System.getenv("OSSRH_USERNAME")
@@ -34,8 +48,9 @@ the<PublishingExtension>().apply {
         }
     }
 
-    publications.withType<MavenPublication>().configureEach {
-        if(name == "jvm") artifact(tasks.getByName("dokkaJavadocJar"))
+    publications.withType(MavenPublication::class) {
+        // javadoc jar is mandatory for publishing to MavenCentral
+        artifact(javadocJar)
         pom {
             name.set("fritz2")
             description.set("Easily build reactive web-apps in Kotlin based on flows and coroutines")

diff --git a/serialization/build.gradle.kts b/serialization/build.gradle.kts
@@ -17,13 +17,4 @@ kotlin {
     }
 }
 
-// Generates a javadoc jar from dokka html sources
-val dokkaJavadocJar by tasks.creating(Jar::class) {
-    group = JavaBasePlugin.DOCUMENTATION_GROUP
-    description = "Assembles java doc to jar"
-    archiveClassifier.set("javadoc")
-    dependsOn(tasks.dokkaHtml)
-    from(tasks.dokkaHtml.flatMap { it.outputDirectory })
-}
-
 apply(from = "$rootDir/publishing.gradle.kts")