Build: Use javadocJar helper to specify artifact explicitly

Creating javadocJar task for every project produces lots of unnecessary
tasks, some project don't even have code. Jar task without outDir
property set fails idea import with gradle 5.0+

build.gradle.kts

@@ -338,10 +338,6 @@ allprojects {
         enabled = false
     }
 
-    task<Jar>("javadocJar") {
-        classifier = "javadoc"
-    }
-
     tasks.withType<Jar> {
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     }

libraries/commonConfiguration.gradle

@@ -213,10 +213,13 @@ ext.configurePublishing = { Project project ->
 
         task publish(dependsOn: uploadArchives)
     }
-
 }
 
 allprojects { project ->
+    project.ext.javadocJar = { lambda = {} ->
+        ArtifactsKt.javadocJar(project, lambda)
+    }
+    
     dependencies.ext.kotlinStdlib = { suffix ->
         DependenciesKt.kotlinStdlib(project, suffix)
     }

libraries/kotlin.test/annotations-common/build.gradle

@@ -27,5 +27,6 @@ task sourcesJar(type: Jar, dependsOn: classes) {
 
 artifacts {
     archives sourcesJar
-    archives javadocJar
+}
-}
+
+javadocJar()

libraries/kotlin.test/common/build.gradle

@@ -29,9 +29,10 @@ classes.dependsOn.remove("compileJava")
 
 artifacts {
     archives sourcesJar
-    archives javadocJar
 }
 
+javadocJar()
+
 compileKotlinCommon {
     kotlinOptions {
         freeCompilerArgs = [

libraries/kotlin.test/js/build.gradle

@@ -44,9 +44,10 @@ task sourcesJar(type: Jar, dependsOn: classes) {
 
 artifacts {
     archives sourcesJar
-    archives javadocJar
 }
 
+javadocJar()
+
 task distJs(type: Copy) {
     dependsOn(compileKotlin2Js)
     from(compileKotlin2Js.kotlinOptions.outputFile)

libraries/kotlin.test/junit/build.gradle

@@ -24,9 +24,10 @@ jar {
 
 artifacts {
     archives sourcesJar
-    archives javadocJar
 }
 
+javadocJar()
+
 dist {
     from (jar, sourcesJar)
 }

libraries/kotlin.test/junit5/build.gradle

@@ -24,9 +24,10 @@ jar {
 
 artifacts {
     archives sourcesJar
-    archives javadocJar
 }
 
+javadocJar()
+
 dist {
     from (jar, sourcesJar)
 }

libraries/kotlin.test/jvm/build.gradle

@@ -47,10 +47,11 @@ task modularJar(type: Jar) {
 
 artifacts {
     archives sourcesJar
-    archives javadocJar
     archives modularJar
 }
 
+javadocJar()
+
 dist {
     from (jar, sourcesJar)
 }

libraries/kotlin.test/testng/build.gradle

@@ -21,9 +21,10 @@ jar {
 
 artifacts {
     archives sourcesJar
-    archives javadocJar
 }
 
+javadocJar()
+
 dist {
     from (jar, sourcesJar)
 }

libraries/stdlib/common/build.gradle

@@ -103,9 +103,10 @@ configurations {
 artifacts {
     archives sourcesJar
     sources sourcesJar
-    archives javadocJar
 }
 
+javadocJar()
+
 // TODO: call the "dist" task instead, once we need to publish kotlin-stdlib-common.jar with the compiler distribution
 task distCommon(type: Copy) {
     from(jar)

libraries/stdlib/jdk7/build.gradle

@@ -58,10 +58,11 @@ task modularJar(type: Jar) {
 
 artifacts {
     archives sourcesJar
-    archives javadocJar
     archives modularJar
 }
 
+javadocJar()
+
 dist {
     from (jar, sourcesJar)
 }

libraries/stdlib/jdk8/build.gradle

@@ -61,10 +61,11 @@ task modularJar(type: Jar) {
 
 artifacts {
     archives sourcesJar
-    archives javadocJar
     archives modularJar
 }
 
+javadocJar()
+
 dist {
     from (jar, sourcesJar)
 }

libraries/stdlib/js/build.gradle

@@ -345,9 +345,10 @@ artifacts {
     runtime mergedJar
     archives mergedJar
     archives sourcesJar
-    archives javadocJar
 }
 
+javadocJar()
+
 task distJs(type: Copy) {
     from(compileJs)
     into "$distDir/js"

libraries/stdlib/jvm/build.gradle

@@ -137,10 +137,11 @@ task modularJar(type: Jar) {
 
 artifacts {
     archives sourcesJar
-    archives javadocJar
     archives modularJar
 }
 
+javadocJar()
+
 dist {
     dependsOn distMavenSources
 

libraries/tools/kotlin-allopen/build.gradle

@@ -40,9 +40,10 @@ ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDepsToShadedCompiler(project
 
 artifacts {
     archives sourcesJar
-    archives javadocJar
 }
 
+javadocJar()
+
 pluginBundle {
     plugins {
         kotlinAllopenPlugin {

libraries/tools/kotlin-annotations-jvm/build.gradle

@@ -21,9 +21,10 @@ sourceSets {
 
 artifacts {
     archives sourcesJar
-    archives javadocJar
 }
 
+javadocJar()
+
 dist {
     from (jar, sourcesJar)
 }

libraries/tools/kotlin-noarg/build.gradle

@@ -46,9 +46,10 @@ ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDepsToShadedCompiler(project
 
 artifacts {
     archives sourcesJar
-    archives javadocJar
 }
 
+javadocJar()
+
 pluginBundle {
     plugins {
         kotlinNoargPlugin {

libraries/tools/kotlin-sam-with-receiver/build.gradle

@@ -46,7 +46,8 @@ ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDepsToShadedCompiler(project
 
 artifacts {
     archives sourcesJar
-    archives javadocJar
 }
 
+javadocJar()
+
 test.executable = "${JDK_18}/bin/java"

libraries/tools/kotlin-serialization-unshaded/build.gradle

@@ -21,5 +21,6 @@ ArtifactsKt.runtimeJar(project, jar, {})
 
 artifacts {
     archives sourcesJar
-    archives javadocJar
+}
-}
+
+javadocJar()

libraries/tools/kotlin-serialization/build.gradle

@@ -29,5 +29,6 @@ ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDepsToShadedCompiler(project
 
 artifacts {
     archives sourcesJar
-    archives javadocJar
 }
+
+javadocJar()

libraries/tools/script-runtime/build.gradle

@@ -33,10 +33,11 @@ jar {
 
 artifacts {
     archives sourcesJar
-    archives javadocJar
     mainJar jar
 }
 
+javadocJar()
+
 dist {
     from (jar, sourcesJar)
 }