Apply publishing conventions to kotest-bom (#4073)

apply the publishing convention plugin in kotest-bom - update publishing-convention to only adds a Javadoc JAR for KMP subprojects - remove duplicated configuration in kotest-bom
kotest · Jun 9, 2024 · ca5c340 · ca5c340
1 parent f1def7c
commit ca5c340
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 61 deletions.
diff --git a/buildSrc/src/main/kotlin/kotest-publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotest-publishing-conventions.gradle.kts
@@ -49,8 +49,6 @@ publishing {
    }
 
    publications.withType<MavenPublication>().configureEach {
-      artifact(javadocJar)
-
       pom {
          name.set("Kotest")
          description.set("Kotlin Test Framework")
@@ -81,6 +79,10 @@ publishing {
 }
 
 pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") {
+   publishing.publications.withType<MavenPublication>().configureEach {
+      artifact(javadocJar)
+   }
+
    publishPlatformArtifactsInRootModule(project)
 }
 

diff --git a/kotest-bom/build.gradle.kts b/kotest-bom/build.gradle.kts
@@ -1,12 +1,8 @@
 plugins {
    `java-platform`
-   `maven-publish`
-   signing
+   id("kotest-publishing-conventions")
 }
 
-group = "io.kotest"
-version = Ci.publishVersion
-
 val bomProject = project
 
 // Explicitly exclude subprojects that will never be published so that when configuring this project
@@ -44,64 +40,10 @@ dependencies {
    }
 }
 
-val ossrhUsername: String by project
-val ossrhPassword: String by project
-val signingKey: String? by project
-val signingPassword: String? by project
-
 publishing {
-   repositories {
-      maven {
-         val releasesRepoUrl = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
-         val snapshotsRepoUrl = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
-         name = "deploy"
-         url = if (Ci.isRelease) releasesRepoUrl else snapshotsRepoUrl
-         credentials {
-            username = System.getenv("OSSRH_USERNAME") ?: ossrhUsername
-            password = System.getenv("OSSRH_PASSWORD") ?: ossrhPassword
-         }
-      }
-   }
-
    publications {
       create<MavenPublication>("KotestBom") {
          from(components["javaPlatform"])
-         pom {
-            name.set("Kotest")
-            description.set("Kotlin Test Framework")
-            url.set("https://github.com/kotest/kotest")
-
-            scm {
-               connection.set("scm:git:https://github.com/kotest/kotest/")
-               developerConnection.set("scm:git:https://github.com/sksamuel/")
-               url.set("https://github.com/kotest/kotest/")
-            }
-
-            licenses {
-               license {
-                  name.set("Apache-2.0")
-                  url.set("https://opensource.org/licenses/Apache-2.0")
-               }
-            }
-
-            developers {
-               developer {
-                  id.set("sksamuel")
-                  name.set("Stephen Samuel")
-                  email.set("sam@sksamuel.com")
-               }
-            }
-         }
       }
    }
 }
-
-signing {
-   useGpgCmd()
-   if (signingKey != null && signingPassword != null) {
-      useInMemoryPgpKeys(signingKey, signingPassword)
-   }
-   if (Ci.isRelease) {
-      sign(publishing.publications)
-   }
-}