From 6d5f1c84a78f4c1f3f8db086f9e455bbb2b26fcb Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Fri, 30 Jun 2023 18:33:15 +0200 Subject: [PATCH] [repo] Migrate Groovy build scripts to use 'javadocJar()' directly from buildSrc --- .../main/kotlin/{artifacts.kt => repoArtifacts.kt} | 2 ++ kotlin-native/backend.native/build.gradle | 2 +- libraries/commonConfiguration.gradle | 11 ++--------- .../kotlin-gradle-subplugin-example/build.gradle | 4 ++-- 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-annotations-jvm/build.gradle | 2 +- .../tools/kotlin-serialization-unshaded/build.gradle | 4 ++-- libraries/tools/script-runtime/build.gradle | 2 +- 19 files changed, 23 insertions(+), 28 deletions(-) rename buildSrc/src/main/kotlin/{artifacts.kt => repoArtifacts.kt} (99%) diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/repoArtifacts.kt similarity index 99% rename from buildSrc/src/main/kotlin/artifacts.kt rename to buildSrc/src/main/kotlin/repoArtifacts.kt index 34826078f7e..103549b4608 100644 --- a/buildSrc/src/main/kotlin/artifacts.kt +++ b/buildSrc/src/main/kotlin/repoArtifacts.kt @@ -1,4 +1,5 @@ @file:Suppress("unused") // usages in build scripts are not tracked properly +@file:JvmName("RepoArtifacts") import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.gradle.api.Project @@ -219,6 +220,7 @@ fun Jar.addEmbeddedSources(configurationName: String = "embedded") { } } +@JvmOverloads fun Project.javadocJar(body: Jar.() -> Unit = {}): TaskProvider { configure { withJavadocJar() diff --git a/kotlin-native/backend.native/build.gradle b/kotlin-native/backend.native/build.gradle index b35ae3131eb..7b37e923b36 100644 --- a/kotlin-native/backend.native/build.gradle +++ b/kotlin-native/backend.native/build.gradle @@ -249,7 +249,7 @@ publishing { } } -ArtifactsKt.sourcesJar(project) { +RepoArtifacts.sourcesJar(project) { it.from(sourceSets["cli_bc"].allSource) it.from(sourceSets["compiler"].allSource) } diff --git a/libraries/commonConfiguration.gradle b/libraries/commonConfiguration.gradle index 52edfefcccf..05356de760a 100644 --- a/libraries/commonConfiguration.gradle +++ b/libraries/commonConfiguration.gradle @@ -50,7 +50,7 @@ task preparePublication { } ext.configurePublishing = { Project project, configure = { } -> - ArtifactsKt.publish(project, false, true) { publication -> + RepoArtifacts.publish(project, false, true) { publication -> configure.delegate = publication configure() } @@ -74,14 +74,7 @@ ext.configureFrontendIr = { Project project -> allprojects { project -> project.ext.configureSourcesJar = { lambda = {} -> - ArtifactsKt.sourcesJar(project) { task -> - lambda.delegate = task - lambda() - } - } - - project.ext.configureJavadocJar = { lambda = {} -> - ArtifactsKt.javadocJar(project) { task -> + RepoArtifacts.sourcesJar(project) { task -> lambda.delegate = task lambda() } diff --git a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle index bf4beb80dbf..86398ae327d 100644 --- a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle +++ b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle @@ -53,12 +53,12 @@ def shadowJarTask = EmbeddableKt.embeddableCompilerDummyForDependenciesRewriting project, "${EmbeddableKt.EMBEDDABLE_COMPILER_TASK_NAME}${sourceSet.jarTaskName.capitalize()}" ) { - ArtifactsKt.setupPublicJar( + RepoArtifacts.setupPublicJar( it, jarTask.flatMap { it.archiveBaseName }, jarTask.flatMap { it.archiveClassifier } ) - ArtifactsKt.addEmbeddedRuntime(it) + RepoArtifacts.addEmbeddedRuntime(it) it.from(sourceSet.output) // When Gradle traverses the inputs, reject the shaded compiler JAR, diff --git a/libraries/kotlin.test/annotations-common/build.gradle b/libraries/kotlin.test/annotations-common/build.gradle index 6ba1da12e41..ffd9a52383d 100644 --- a/libraries/kotlin.test/annotations-common/build.gradle +++ b/libraries/kotlin.test/annotations-common/build.gradle @@ -18,4 +18,4 @@ jar { } configureSourcesJar() -configureJavadocJar() +RepoArtifacts.javadocJar(project) diff --git a/libraries/kotlin.test/common/build.gradle b/libraries/kotlin.test/common/build.gradle index 0b46303e671..dc5871b3a21 100644 --- a/libraries/kotlin.test/common/build.gradle +++ b/libraries/kotlin.test/common/build.gradle @@ -14,7 +14,7 @@ jar { } configureSourcesJar() -configureJavadocJar() +RepoArtifacts.javadocJar(project) tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinCompile) { kotlinOptions.freeCompilerArgs += ["-Xallow-kotlin-package", "-opt-in=kotlin.RequiresOptIn"] diff --git a/libraries/kotlin.test/js/build.gradle b/libraries/kotlin.test/js/build.gradle index 52cec60433c..4feac57b625 100644 --- a/libraries/kotlin.test/js/build.gradle +++ b/libraries/kotlin.test/js/build.gradle @@ -88,4 +88,4 @@ artifacts { configureSourcesJar() -configureJavadocJar() +RepoArtifacts.javadocJar(project) diff --git a/libraries/kotlin.test/junit/build.gradle b/libraries/kotlin.test/junit/build.gradle index 3921db0316e..c5072ca1438 100644 --- a/libraries/kotlin.test/junit/build.gradle +++ b/libraries/kotlin.test/junit/build.gradle @@ -27,7 +27,7 @@ jar { } configureSourcesJar() -configureJavadocJar() +RepoArtifacts.javadocJar(project) compileKotlin { kotlinOptions.freeCompilerArgs = [ diff --git a/libraries/kotlin.test/junit5/build.gradle b/libraries/kotlin.test/junit5/build.gradle index ee45d60e388..43f72e7600f 100644 --- a/libraries/kotlin.test/junit5/build.gradle +++ b/libraries/kotlin.test/junit5/build.gradle @@ -28,7 +28,7 @@ jar { } configureSourcesJar() -configureJavadocJar() +RepoArtifacts.javadocJar(project) compileKotlin { kotlinOptions.freeCompilerArgs = [ diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle index 8b52a69084f..59c725d154d 100644 --- a/libraries/kotlin.test/jvm/build.gradle +++ b/libraries/kotlin.test/jvm/build.gradle @@ -30,7 +30,7 @@ jar { configureSourcesJar() -configureJavadocJar() +RepoArtifacts.javadocJar(project) compileKotlin { kotlinOptions.freeCompilerArgs = [ diff --git a/libraries/kotlin.test/testng/build.gradle b/libraries/kotlin.test/testng/build.gradle index bbe01578113..caa81e3018a 100644 --- a/libraries/kotlin.test/testng/build.gradle +++ b/libraries/kotlin.test/testng/build.gradle @@ -29,7 +29,7 @@ jar { } configureSourcesJar() -configureJavadocJar() +RepoArtifacts.javadocJar(project) compileKotlin { kotlinOptions.freeCompilerArgs = [ diff --git a/libraries/stdlib/common/build.gradle b/libraries/stdlib/common/build.gradle index 736233199e2..d154845a4ef 100644 --- a/libraries/stdlib/common/build.gradle +++ b/libraries/stdlib/common/build.gradle @@ -67,7 +67,7 @@ jar { } configureSourcesJar() -configureJavadocJar() +RepoArtifacts.javadocJar(project) sourcesJar.dependsOn(":prepare:build.version:writeStdlibVersion") diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle index 6f3a1dfa2a6..e0dcdbd3837 100644 --- a/libraries/stdlib/jdk7/build.gradle +++ b/libraries/stdlib/jdk7/build.gradle @@ -6,7 +6,7 @@ JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8) configurePublishing(project) configureSourcesJar() -configureJavadocJar() +RepoArtifacts.javadocJar(project) sourceSets { main { diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle index 0c5f1ae7118..a3da8b3a211 100644 --- a/libraries/stdlib/jdk8/build.gradle +++ b/libraries/stdlib/jdk8/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'kotlin' configurePublishing(project) configureSourcesJar() -configureJavadocJar() +RepoArtifacts.javadocJar(project) dependencies { api project(':kotlin-stdlib') diff --git a/libraries/stdlib/js-v1/build.gradle b/libraries/stdlib/js-v1/build.gradle index 1d365519e12..3767da9bb3d 100644 --- a/libraries/stdlib/js-v1/build.gradle +++ b/libraries/stdlib/js-v1/build.gradle @@ -8,7 +8,7 @@ apply plugin: 'kotlin-platform-js' apply plugin: 'idea' configurePublishing(project) -configureJavadocJar() +RepoArtifacts.javadocJar(project) configurations { sources diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle index 92c1b653e6f..d294ceb6f04 100644 --- a/libraries/stdlib/jvm/build.gradle +++ b/libraries/stdlib/jvm/build.gradle @@ -9,7 +9,7 @@ archivesBaseName = 'kotlin-stdlib' JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8) configurePublishing(project) -configureJavadocJar() +RepoArtifacts.javadocJar(project) configureSourcesJar() configurations { diff --git a/libraries/tools/kotlin-annotations-jvm/build.gradle b/libraries/tools/kotlin-annotations-jvm/build.gradle index 6810a96b377..4e203bf939f 100644 --- a/libraries/tools/kotlin-annotations-jvm/build.gradle +++ b/libraries/tools/kotlin-annotations-jvm/build.gradle @@ -19,7 +19,7 @@ dependencies { } configureSourcesJar() -configureJavadocJar() +RepoArtifacts.javadocJar(project) compileKotlin { kotlinOptions.freeCompilerArgs = [ diff --git a/libraries/tools/kotlin-serialization-unshaded/build.gradle b/libraries/tools/kotlin-serialization-unshaded/build.gradle index 6201329647c..9c9ce3509d9 100644 --- a/libraries/tools/kotlin-serialization-unshaded/build.gradle +++ b/libraries/tools/kotlin-serialization-unshaded/build.gradle @@ -6,6 +6,6 @@ dependencies { embedded(project(":kotlinx-serialization-compiler-plugin")) { transitive = false } } -ArtifactsKt.runtimeJar(project, {}) +RepoArtifacts.runtimeJar(project, {}) configureSourcesJar() -configureJavadocJar() +RepoArtifacts.javadocJar(project) diff --git a/libraries/tools/script-runtime/build.gradle b/libraries/tools/script-runtime/build.gradle index 31ca13b1285..a0b1ea3ee49 100644 --- a/libraries/tools/script-runtime/build.gradle +++ b/libraries/tools/script-runtime/build.gradle @@ -23,7 +23,7 @@ jar { } configureSourcesJar() -configureJavadocJar() +RepoArtifacts.javadocJar(project) compileKotlin { kotlinOptions.freeCompilerArgs = [