From c2589c7d6d77f9a10b01bec2b0f52ad366eaae16 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Sun, 26 Apr 2020 15:07:42 +0300
Subject: [PATCH] Build: Rename javadocJar for groovy to configureJavadocJar

So it doesn't interfere with javadocJar task accessor
---
 libraries/commonConfiguration.gradle                       | 2 +-
 libraries/kotlin.test/annotations-common/build.gradle      | 2 +-
 libraries/kotlin.test/common/build.gradle                  | 2 +-
 libraries/kotlin.test/js/build.gradle                      | 2 +-
 libraries/kotlin.test/junit/build.gradle                   | 2 +-
 libraries/kotlin.test/junit5/build.gradle                  | 2 +-
 libraries/kotlin.test/jvm/build.gradle                     | 2 +-
 libraries/kotlin.test/testng/build.gradle                  | 2 +-
 libraries/stdlib/common/build.gradle                       | 2 +-
 libraries/stdlib/jdk7/build.gradle                         | 2 +-
 libraries/stdlib/jdk8/build.gradle                         | 2 +-
 libraries/stdlib/js-v1/build.gradle                        | 2 +-
 libraries/stdlib/jvm/build.gradle                          | 2 +-
 libraries/tools/kotlin-allopen/build.gradle                | 2 +-
 libraries/tools/kotlin-annotations-jvm/build.gradle        | 2 +-
 libraries/tools/kotlin-noarg/build.gradle                  | 2 +-
 libraries/tools/kotlin-sam-with-receiver/build.gradle      | 2 +-
 libraries/tools/kotlin-serialization-unshaded/build.gradle | 2 +-
 libraries/tools/kotlin-serialization/build.gradle          | 2 +-
 libraries/tools/script-runtime/build.gradle                | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/libraries/commonConfiguration.gradle b/libraries/commonConfiguration.gradle
index 68c3f3c9e34..8cce8e82110 100644
--- 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)
     }
 
diff --git a/libraries/kotlin.test/annotations-common/build.gradle b/libraries/kotlin.test/annotations-common/build.gradle
index 50c7d403892..a30e24c41be 100644
--- a/libraries/kotlin.test/annotations-common/build.gradle
+++ b/libraries/kotlin.test/annotations-common/build.gradle
@@ -26,4 +26,4 @@ artifacts {
     archives sourcesJar
 }
 
-javadocJar()
\ No newline at end of file
+configureJavadocJar()
\ No newline at end of file
diff --git a/libraries/kotlin.test/common/build.gradle b/libraries/kotlin.test/common/build.gradle
index 057fa80468b..c52598aa2d4 100644
--- 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"
diff --git a/libraries/kotlin.test/js/build.gradle b/libraries/kotlin.test/js/build.gradle
index 035a2f64cc0..918324ad93e 100644
--- a/libraries/kotlin.test/js/build.gradle
+++ b/libraries/kotlin.test/js/build.gradle
@@ -85,4 +85,4 @@ artifacts {
     }
 }
 
-javadocJar()
+configureJavadocJar()
diff --git a/libraries/kotlin.test/junit/build.gradle b/libraries/kotlin.test/junit/build.gradle
index cac83e13e0d..f1f020d089c 100644
--- 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]
diff --git a/libraries/kotlin.test/junit5/build.gradle b/libraries/kotlin.test/junit5/build.gradle
index 4886849c6b8..dd260436a2d 100644
--- 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
diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle
index 8f0f791a79a..8c7036a9154 100644
--- 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",
diff --git a/libraries/kotlin.test/testng/build.gradle b/libraries/kotlin.test/testng/build.gradle
index e845c7f955b..3037ba83adf 100644
--- 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]
diff --git a/libraries/stdlib/common/build.gradle b/libraries/stdlib/common/build.gradle
index 6e3553bf6b1..d95c33a35a9 100644
--- 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" })
diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle
index 15d9d9eff88..149e5edc75a 100644
--- 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
diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle
index 1ba567d56e6..5a681bdba0f 100644
--- 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
diff --git a/libraries/stdlib/js-v1/build.gradle b/libraries/stdlib/js-v1/build.gradle
index 501445c430a..28beec3cdfb 100644
--- 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
diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle
index 1272c7f6099..f167f098278 100644
--- 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)
diff --git a/libraries/tools/kotlin-allopen/build.gradle b/libraries/tools/kotlin-allopen/build.gradle
index 40e3b63da98..5f88e5f521f 100644
--- 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 {
diff --git a/libraries/tools/kotlin-annotations-jvm/build.gradle b/libraries/tools/kotlin-annotations-jvm/build.gradle
index f12afdc894f..27e8fe51ce2 100644
--- 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
diff --git a/libraries/tools/kotlin-noarg/build.gradle b/libraries/tools/kotlin-noarg/build.gradle
index ffba67fb827..fabd16ff283 100644
--- 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 {
diff --git a/libraries/tools/kotlin-sam-with-receiver/build.gradle b/libraries/tools/kotlin-sam-with-receiver/build.gradle
index 9725262cb74..57d684cbeb3 100644
--- 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"
\ No newline at end of file
diff --git a/libraries/tools/kotlin-serialization-unshaded/build.gradle b/libraries/tools/kotlin-serialization-unshaded/build.gradle
index e44ab72c5f9..8fb557571f0 100644
--- 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()
diff --git a/libraries/tools/kotlin-serialization/build.gradle b/libraries/tools/kotlin-serialization/build.gradle
index 3692167959c..73c4739141e 100644
--- 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 {
diff --git a/libraries/tools/script-runtime/build.gradle b/libraries/tools/script-runtime/build.gradle
index 553137d2498..00a2ee136b3 100644
--- 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 = [