Build: Rename javadocJar for groovy to configureJavadocJar

So it doesn't interfere with javadocJar task accessor
2026-03-10 08:31:29 +00:00 · 2020-04-26 15:07:42 +03:00
parent d711086be2
commit c2589c7d6d
20 changed files with 20 additions and 20 deletions
--- a/libraries/commonConfiguration.gradle
+++ b/libraries/commonConfiguration.gradle
@@ -207,7 +207,7 @@ ext.configurePublishing = { Project project ->
 }

 allprojects { project ->
-    project.ext.javadocJar = { lambda = {} ->
+    project.ext.configureJavadocJar = { lambda = {} ->
        ArtifactsKt.javadocJar(project, lambda)
    }

--- a/libraries/kotlin.test/annotations-common/build.gradle
+++ b/libraries/kotlin.test/annotations-common/build.gradle
@@ -26,4 +26,4 @@ artifacts {
    archives sourcesJar
 }

-javadocJar()
+configureJavadocJar()
--- a/libraries/kotlin.test/common/build.gradle
+++ b/libraries/kotlin.test/common/build.gradle
@@ -22,7 +22,7 @@ artifacts {
    archives sourcesJar
 }

-javadocJar()
+configureJavadocJar()

 tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinCompile) {
    kotlinOptions.freeCompilerArgs += "-Xallow-kotlin-package"
--- a/libraries/kotlin.test/js/build.gradle
+++ b/libraries/kotlin.test/js/build.gradle
@@ -85,4 +85,4 @@ artifacts {
    }
 }

-javadocJar()
+configureJavadocJar()
--- a/libraries/kotlin.test/junit/build.gradle
+++ b/libraries/kotlin.test/junit/build.gradle
@@ -32,7 +32,7 @@ artifacts {
    sources sourcesJar
 }

-javadocJar()
+configureJavadocJar()

 compileKotlin {
    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-module-name", project.name]
--- a/libraries/kotlin.test/junit5/build.gradle
+++ b/libraries/kotlin.test/junit5/build.gradle
@@ -37,7 +37,7 @@ artifacts {
    sources sourcesJar
 }

-javadocJar()
+configureJavadocJar()

 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
    kotlinOptions.jdkHome = JDK_18
--- a/libraries/kotlin.test/jvm/build.gradle
+++ b/libraries/kotlin.test/jvm/build.gradle
@@ -43,7 +43,7 @@ artifacts {
    archives modularJar
 }

-javadocJar()
+configureJavadocJar()

 compileKotlin {
    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xnormalize-constructor-calls=enable",
--- a/libraries/kotlin.test/testng/build.gradle
+++ b/libraries/kotlin.test/testng/build.gradle
@@ -35,7 +35,7 @@ artifacts {
    sources sourcesJar
 }

-javadocJar()
+configureJavadocJar()

 compileKotlin {
    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-module-name", project.name]
--- a/libraries/stdlib/common/build.gradle
+++ b/libraries/stdlib/common/build.gradle
@@ -76,6 +76,6 @@ artifacts {
    sources sourcesJar
 }

-javadocJar()
+configureJavadocJar()

 classes.setDependsOn(classes.dependsOn.findAll { it != "compileJava" })
--- a/libraries/stdlib/jdk7/build.gradle
+++ b/libraries/stdlib/jdk7/build.gradle
@@ -65,7 +65,7 @@ artifacts {
    archives modularJar
 }

-javadocJar()
+configureJavadocJar()

 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
    kotlinOptions.jdkHome = JDK_17
--- a/libraries/stdlib/jdk8/build.gradle
+++ b/libraries/stdlib/jdk8/build.gradle
@@ -59,7 +59,7 @@ artifacts {
    archives modularJar
 }

-javadocJar()
+configureJavadocJar()

 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
    kotlinOptions.jdkHome = JDK_18
--- a/libraries/stdlib/js-v1/build.gradle
+++ b/libraries/stdlib/js-v1/build.gradle
@@ -305,7 +305,7 @@ task distSourcesJar(type: Jar) {
    }
 }

-def javadocJar = javadocJar()
+def javadocJar = configureJavadocJar()

 artifacts {
    runtime libraryJarWithIr
--- a/libraries/stdlib/jvm/build.gradle
+++ b/libraries/stdlib/jvm/build.gradle
@@ -99,7 +99,7 @@ artifacts {
    archives modularJar
 }

-javadocJar()
+configureJavadocJar()

 DexMethodCountKt.dexMethodCount(project) { task ->
    task.from(jar)
--- a/libraries/tools/kotlin-allopen/build.gradle
+++ b/libraries/tools/kotlin-allopen/build.gradle
@@ -40,7 +40,7 @@ artifacts {
    archives sourcesJar
 }

-javadocJar()
+configureJavadocJar()

 pluginBundle {
    plugins {
--- a/libraries/tools/kotlin-annotations-jvm/build.gradle
+++ b/libraries/tools/kotlin-annotations-jvm/build.gradle
@@ -22,7 +22,7 @@ artifacts {
    sources sourcesJar
 }

-javadocJar()
+configureJavadocJar()

 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
    kotlinOptions.jdkHome = JDK_16
--- a/libraries/tools/kotlin-noarg/build.gradle
+++ b/libraries/tools/kotlin-noarg/build.gradle
@@ -46,7 +46,7 @@ artifacts {
    archives sourcesJar
 }

-javadocJar()
+configureJavadocJar()

 pluginBundle {
    plugins {
--- a/libraries/tools/kotlin-sam-with-receiver/build.gradle
+++ b/libraries/tools/kotlin-sam-with-receiver/build.gradle
@@ -46,6 +46,6 @@ artifacts {
    archives sourcesJar
 }

-javadocJar()
+configureJavadocJar()

 test.executable = "${JDK_18}/bin/java"
--- a/libraries/tools/kotlin-serialization-unshaded/build.gradle
+++ b/libraries/tools/kotlin-serialization-unshaded/build.gradle
@@ -24,4 +24,4 @@ artifacts {
    archives sourcesJar
 }

-javadocJar()
+configureJavadocJar()
--- a/libraries/tools/kotlin-serialization/build.gradle
+++ b/libraries/tools/kotlin-serialization/build.gradle
@@ -34,7 +34,7 @@ artifacts {
    archives sourcesJar
 }

-javadocJar()
+configureJavadocJar()

 pluginBundle {
    plugins {
--- a/libraries/tools/script-runtime/build.gradle
+++ b/libraries/tools/script-runtime/build.gradle
@@ -31,7 +31,7 @@ artifacts {
    mainJar jar
 }

-javadocJar()
+configureJavadocJar()

 compileKotlin {
    kotlinOptions.freeCompilerArgs = [