From 73a757c1053ff6c922ea9e3d18091ee73e521cd1 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Fri, 30 Jun 2023 19:01:24 +0200 Subject: [PATCH] [repo] Migrate Groovy build scripts to use 'publish()' directly from buildSrc --- buildSrc/src/main/kotlin/repoArtifacts.kt | 1 + libraries/commonConfiguration.gradle | 7 ------- 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 +- libraries/tools/kotlin-serialization-unshaded/build.gradle | 2 +- libraries/tools/script-runtime/build.gradle | 2 +- 10 files changed, 9 insertions(+), 15 deletions(-) diff --git a/buildSrc/src/main/kotlin/repoArtifacts.kt b/buildSrc/src/main/kotlin/repoArtifacts.kt index d590db05966..43b2703ba22 100644 --- a/buildSrc/src/main/kotlin/repoArtifacts.kt +++ b/buildSrc/src/main/kotlin/repoArtifacts.kt @@ -273,6 +273,7 @@ fun Project.standardPublicJars() { javadocJar() } +@JvmOverloads fun Project.publish(moduleMetadata: Boolean = false, sbom: Boolean = true, configure: MavenPublication.() -> Unit = { }) { apply() diff --git a/libraries/commonConfiguration.gradle b/libraries/commonConfiguration.gradle index 41b5903f772..a0f6c081ba7 100644 --- a/libraries/commonConfiguration.gradle +++ b/libraries/commonConfiguration.gradle @@ -49,13 +49,6 @@ task preparePublication { } } -ext.configurePublishing = { Project project, configure = { } -> - RepoArtifacts.publish(project, false, true) { publication -> - configure.delegate = publication - configure() - } -} - ext.configureFrontendIr = { Project project -> project.tasks.withType(KotlinCompile.class) { task -> task.kotlinOptions { diff --git a/libraries/stdlib/common/build.gradle b/libraries/stdlib/common/build.gradle index 37eecf36bc6..ef3fb8058ca 100644 --- a/libraries/stdlib/common/build.gradle +++ b/libraries/stdlib/common/build.gradle @@ -2,7 +2,7 @@ description = 'Kotlin Common Standard Library' apply plugin: 'kotlin-platform-common' -configurePublishing(project) +RepoArtifacts.publish(project) JvmToolchain.updateJvmTarget(project, "1.8") diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle index fa3501bf15b..10ee36753b8 100644 --- a/libraries/stdlib/jdk7/build.gradle +++ b/libraries/stdlib/jdk7/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'kotlin' JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8) -configurePublishing(project) +RepoArtifacts.publish(project) RepoArtifacts.sourcesJar(project) RepoArtifacts.javadocJar(project) diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle index 7d804a1fdb4..48445f008f2 100644 --- a/libraries/stdlib/jdk8/build.gradle +++ b/libraries/stdlib/jdk8/build.gradle @@ -2,7 +2,7 @@ description = 'Kotlin Standard Library JDK 8 extension' apply plugin: 'kotlin' -configurePublishing(project) +RepoArtifacts.publish(project) RepoArtifacts.sourcesJar(project) RepoArtifacts.javadocJar(project) diff --git a/libraries/stdlib/js-v1/build.gradle b/libraries/stdlib/js-v1/build.gradle index 3767da9bb3d..a2d1c16d2c7 100644 --- a/libraries/stdlib/js-v1/build.gradle +++ b/libraries/stdlib/js-v1/build.gradle @@ -7,7 +7,7 @@ description = 'Kotlin Standard Library for JS' apply plugin: 'kotlin-platform-js' apply plugin: 'idea' -configurePublishing(project) +RepoArtifacts.publish(project) RepoArtifacts.javadocJar(project) configurations { diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle index 150cd79e5d4..c4deb364026 100644 --- a/libraries/stdlib/jvm/build.gradle +++ b/libraries/stdlib/jvm/build.gradle @@ -8,7 +8,7 @@ archivesBaseName = 'kotlin-stdlib' JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8) -configurePublishing(project) +RepoArtifacts.publish(project) RepoArtifacts.javadocJar(project) RepoArtifacts.sourcesJar(project) diff --git a/libraries/tools/kotlin-annotations-jvm/build.gradle b/libraries/tools/kotlin-annotations-jvm/build.gradle index aa4afcd4af3..51ea90764dd 100644 --- a/libraries/tools/kotlin-annotations-jvm/build.gradle +++ b/libraries/tools/kotlin-annotations-jvm/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'kotlin' JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8) -configurePublishing(project) +RepoArtifacts.publish(project) sourceSets { main { diff --git a/libraries/tools/kotlin-serialization-unshaded/build.gradle b/libraries/tools/kotlin-serialization-unshaded/build.gradle index 0a0992f8194..7282f1f4ae0 100644 --- a/libraries/tools/kotlin-serialization-unshaded/build.gradle +++ b/libraries/tools/kotlin-serialization-unshaded/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'kotlin' -configurePublishing(project) +RepoArtifacts.publish(project) dependencies { embedded(project(":kotlinx-serialization-compiler-plugin")) { transitive = false } diff --git a/libraries/tools/script-runtime/build.gradle b/libraries/tools/script-runtime/build.gradle index 49ff4793bb9..16919d14e61 100644 --- a/libraries/tools/script-runtime/build.gradle +++ b/libraries/tools/script-runtime/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'kotlin' JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8) -configurePublishing(project) +RepoArtifacts.publish(project) dependencies { compileOnly RepoDependencies.kotlinStdlib(project)