2 files changed, 16 insertions, 11 deletions
diff --git a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
index 296d5967..8fd45a41 100644
--- a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
@@ -34,3 +34,19 @@ java {
 kotlin {
     explicitApi()
 }
+
+val javadocJar by tasks.registering(Jar::class) {
+    // Note that we publish the Dokka HTML artifacts as Javadoc
+    dependsOn(tasks.dokkaHtml)
+    archiveClassifier.set("javadoc")
+    from(tasks.dokkaHtml)
+}
+
+configure<PublishingExtension> {
+    publications {
+        named<MavenPublication>("maven") {
+            from(components["java"])
+            artifact(javadocJar)
+        }
+    }
+}
diff --git a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
index 76f54102..5b36509f 100644
--- a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
@@ -25,7 +25,6 @@ import org.gradle.api.credentials.PasswordCredentials
 plugins {
     `maven-publish`
     signing
-    id("dokka-conventions")
 }
 
 val isSnapshot = project.version.toString().contains("SNAPSHOT")
@@ -38,13 +37,6 @@ tasks.withType<PublishToMavenLocal>().configureEach {
     dependsOn(tasks.build)
 }
 
-val javadocJar by tasks.registering(Jar::class) {
-    // Note that we publish the Dokka HTML artifacts as Javadoc
-    dependsOn(tasks.dokkaHtml)
-    archiveClassifier.set("javadoc")
-    from(tasks.dokkaHtml)
-}
-
 signing {
     val signingKeyId: String? by project
     val signingKey: String? by project
@@ -64,9 +56,6 @@ signing {
 publishing {
     publications {
         create<MavenPublication>("maven") {
-            from(components["java"])
-            artifact(javadocJar)
-
             pom {
                 name.set(project.name)
                 description.set("Open-source platform for datacenter simulation")