[repo] Migrate Groovy build scripts to use 'publish()' directly from buildSrc

This commit is contained in:
Yahor Berdnikau
2023-06-30 19:01:24 +02:00
committed by Space Team
parent d7fc4a1d27
commit 73a757c105
10 changed files with 9 additions and 15 deletions
@@ -273,6 +273,7 @@ fun Project.standardPublicJars() {
javadocJar() javadocJar()
} }
@JvmOverloads
fun Project.publish(moduleMetadata: Boolean = false, sbom: Boolean = true, configure: MavenPublication.() -> Unit = { }) { fun Project.publish(moduleMetadata: Boolean = false, sbom: Boolean = true, configure: MavenPublication.() -> Unit = { }) {
apply<KotlinBuildPublishingPlugin>() apply<KotlinBuildPublishingPlugin>()
-7
View File
@@ -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 -> ext.configureFrontendIr = { Project project ->
project.tasks.withType(KotlinCompile.class) { task -> project.tasks.withType(KotlinCompile.class) { task ->
task.kotlinOptions { task.kotlinOptions {
+1 -1
View File
@@ -2,7 +2,7 @@ description = 'Kotlin Common Standard Library'
apply plugin: 'kotlin-platform-common' apply plugin: 'kotlin-platform-common'
configurePublishing(project) RepoArtifacts.publish(project)
JvmToolchain.updateJvmTarget(project, "1.8") JvmToolchain.updateJvmTarget(project, "1.8")
+1 -1
View File
@@ -4,7 +4,7 @@ apply plugin: 'kotlin'
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8) JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
configurePublishing(project) RepoArtifacts.publish(project)
RepoArtifacts.sourcesJar(project) RepoArtifacts.sourcesJar(project)
RepoArtifacts.javadocJar(project) RepoArtifacts.javadocJar(project)
+1 -1
View File
@@ -2,7 +2,7 @@ description = 'Kotlin Standard Library JDK 8 extension'
apply plugin: 'kotlin' apply plugin: 'kotlin'
configurePublishing(project) RepoArtifacts.publish(project)
RepoArtifacts.sourcesJar(project) RepoArtifacts.sourcesJar(project)
RepoArtifacts.javadocJar(project) RepoArtifacts.javadocJar(project)
+1 -1
View File
@@ -7,7 +7,7 @@ description = 'Kotlin Standard Library for JS'
apply plugin: 'kotlin-platform-js' apply plugin: 'kotlin-platform-js'
apply plugin: 'idea' apply plugin: 'idea'
configurePublishing(project) RepoArtifacts.publish(project)
RepoArtifacts.javadocJar(project) RepoArtifacts.javadocJar(project)
configurations { configurations {
+1 -1
View File
@@ -8,7 +8,7 @@ archivesBaseName = 'kotlin-stdlib'
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8) JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
configurePublishing(project) RepoArtifacts.publish(project)
RepoArtifacts.javadocJar(project) RepoArtifacts.javadocJar(project)
RepoArtifacts.sourcesJar(project) RepoArtifacts.sourcesJar(project)
@@ -4,7 +4,7 @@ apply plugin: 'kotlin'
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8) JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
configurePublishing(project) RepoArtifacts.publish(project)
sourceSets { sourceSets {
main { main {
@@ -1,6 +1,6 @@
apply plugin: 'kotlin' apply plugin: 'kotlin'
configurePublishing(project) RepoArtifacts.publish(project)
dependencies { dependencies {
embedded(project(":kotlinx-serialization-compiler-plugin")) { transitive = false } embedded(project(":kotlinx-serialization-compiler-plugin")) { transitive = false }
+1 -1
View File
@@ -4,7 +4,7 @@ apply plugin: 'kotlin'
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8) JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
configurePublishing(project) RepoArtifacts.publish(project)
dependencies { dependencies {
compileOnly RepoDependencies.kotlinStdlib(project) compileOnly RepoDependencies.kotlinStdlib(project)