Adopt gradle-maven-publish-plugin

michaelbull · michaelbull · commit a78ec24a5687 · 2025-08-03T21:29:11.000+01:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -32,25 +32,22 @@ jobs:
 
     steps:
       - name: Checkout Project
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@750cdda3edd6d51b7fdfc069d2e2818cf3c44f4c # v3.3.1
-
-      - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: |
             ~/.konan
           key: "${{ runner.os }}-${{ hashFiles('**/.lock') }}"
 
       - name: Setup JDK
-        uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
-          distribution: temurin
-          java-version: 8
+          distribution: zulu
+          java-version: 11
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@750cdda3edd6d51b7fdfc069d2e2818cf3c44f4c # v3.3.1
+        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
 
       - name: Build with Gradle Wrapper
         run: ./gradlew ${{ matrix.tasks }}
@@ -66,63 +63,60 @@ jobs:
         include:
           - os: ubuntu-latest
             tasks: >
-              publishAndroidNativeArm32PublicationToMavenRepository
-              publishAndroidNativeArm64PublicationToMavenRepository
-              publishAndroidNativeX64PublicationToMavenRepository
-              publishAndroidNativeX86PublicationToMavenRepository
-              publishJsPublicationToMavenRepository
-              publishJvmPublicationToMavenRepository
-              publishKotlinMultiplatformPublicationToMavenRepository
-              publishLinuxArm64PublicationToMavenRepository
-              publishLinuxX64PublicationToMavenRepository
-              publishWasmJsPublicationToMavenRepository
+              publishAndroidNativeArm32PublicationToMavenCentralRepository
+              publishAndroidNativeArm64PublicationToMavenCentralRepository
+              publishAndroidNativeX64PublicationToMavenCentralRepository
+              publishAndroidNativeX86PublicationToMavenCentralRepository
+              publishJsPublicationToMavenCentralRepository
+              publishJvmPublicationToMavenCentralRepository
+              publishKotlinMultiplatformPublicationToMavenCentralRepository
+              publishLinuxArm64PublicationToMavenCentralRepository
+              publishLinuxX64PublicationToMavenCentralRepository
+              publishWasmJsPublicationToMavenCentralRepository
 
           - os: windows-latest
-            tasks: publishMingwX64PublicationToMavenRepository
+            tasks: publishMingwX64PublicationToMavenCentralRepository
 
           - os: macos-latest
             tasks: >
-              publishIosArm64PublicationToMavenRepository
-              publishIosSimulatorArm64PublicationToMavenRepository
-              publishIosX64PublicationToMavenRepository
-              publishMacosArm64PublicationToMavenRepository
-              publishMacosX64PublicationToMavenRepository
-              publishTvosArm64PublicationToMavenRepository
-              publishTvosSimulatorArm64PublicationToMavenRepository
-              publishTvosX64PublicationToMavenRepository
-              publishWatchosArm32PublicationToMavenRepository
-              publishWatchosArm64PublicationToMavenRepository
-              publishWatchosDeviceArm64PublicationToMavenRepository
-              publishWatchosSimulatorArm64PublicationToMavenRepository
-              publishWatchosX64PublicationToMavenRepository
+              publishIosArm64PublicationToMavenCentralRepository
+              publishIosSimulatorArm64PublicationToMavenCentralRepository
+              publishIosX64PublicationToMavenCentralRepository
+              publishMacosArm64PublicationToMavenCentralRepository
+              publishMacosX64PublicationToMavenCentralRepository
+              publishTvosArm64PublicationToMavenCentralRepository
+              publishTvosSimulatorArm64PublicationToMavenCentralRepository
+              publishTvosX64PublicationToMavenCentralRepository
+              publishWatchosArm32PublicationToMavenCentralRepository
+              publishWatchosArm64PublicationToMavenCentralRepository
+              publishWatchosDeviceArm64PublicationToMavenCentralRepository
+              publishWatchosSimulatorArm64PublicationToMavenCentralRepository
+              publishWatchosX64PublicationToMavenCentralRepository
 
     steps:
       - name: Checkout Project
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
-      - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@750cdda3edd6d51b7fdfc069d2e2818cf3c44f4c # v3.3.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
+      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: |
             ~/.konan
           key: "${{ runner.os }}-${{ hashFiles('**/.lock') }}"
 
       - name: Setup JDK
-        uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
-          distribution: temurin
-          java-version: 8
+          distribution: zulu
+          java-version: 11
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@750cdda3edd6d51b7fdfc069d2e2818cf3c44f4c # v3.3.1
+        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
 
       - name: Publish with Gradle Wrapper
         run: ./gradlew ${{ matrix.tasks }}
         env:
-          ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.OSSRH_USERNAME }}
-          ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.OSSRH_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.SIGNING_KEY_ID }}
-          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
-          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.SIGNING_KEY_ID }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -4,4 +4,5 @@ plugins {
 
 dependencies {
     implementation(libs.kotlin.gradle.plugin)
+    implementation(libs.maven.publish.plugin)
 }
diff --git a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts
@@ -1,6 +1,5 @@
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
-import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
 
 plugins {
     kotlin("multiplatform")
@@ -9,9 +8,15 @@ plugins {
 kotlin {
     explicitApi()
 
-    jvmToolchain(8)
+    compilerOptions {
+        optIn.add("kotlin.contracts.ExperimentalContracts")
+    }
 
-    jvm()
+    jvm {
+        compilerOptions {
+            jvmTarget.set(JVM_1_8)
+        }
+    }
 
     js(IR) {
         browser()
@@ -59,12 +64,6 @@ kotlin {
     watchosDeviceArm64()
 
     sourceSets {
-        all {
-            languageSettings.apply {
-                optIn("kotlin.contracts.ExperimentalContracts")
-            }
-        }
-
         commonTest {
             dependencies {
                 implementation(kotlin("test"))
@@ -90,13 +89,3 @@ tasks.withType<Jar> {
         into("META-INF")
     }
 }
-
-/* https://youtrack.jetbrains.com/issue/KT-63014/Running-tests-with-wasmJs-in-1.9.20-requires-Chrome-Canary#focus=Comments-27-8321383.0-0 */
-rootProject.the<NodeJsRootExtension>().apply {
-    nodeVersion = "21.0.0-v8-canary202309143a48826a08"
-    nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
-}
-
-rootProject.tasks.withType<KotlinNpmInstallTask> {
-    args.add("--ignore-engines")
-}
diff --git a/buildSrc/src/main/kotlin/publish-conventions.gradle.kts b/buildSrc/src/main/kotlin/publish-conventions.gradle.kts
@@ -1,108 +1,82 @@
+import com.vanniktech.maven.publish.JavadocJar
+import com.vanniktech.maven.publish.KotlinMultiplatform
+
 plugins {
-    `maven-publish`
-    signing
+    id("com.vanniktech.maven.publish")
 }
 
-publishing {
-    repositories {
-        maven {
-            if (project.version.toString().endsWith("SNAPSHOT")) {
-                setUrl("https://oss.sonatype.org/content/repositories/snapshots")
-            } else {
-                setUrl("https://oss.sonatype.org/service/local/staging/deploy/maven2")
+mavenPublishing {
+    publishToMavenCentral()
+    signAllPublications()
+
+    configure(
+        KotlinMultiplatform(
+            javadocJar = JavadocJar.Empty(),
+            sourcesJar = true,
+        )
+    )
+
+    pom {
+        name.set(project.name)
+        description.set(project.description)
+        url.set("https://github.com/michaelbull/kotlin-retry")
+        inceptionYear.set("2019")
+
+        licenses {
+            license {
+                name.set("ISC License")
+                url.set("https://opensource.org/licenses/isc-license.txt")
             }
+        }
 
-            credentials {
-                val ossrhUsername: String? by project
-                val ossrhPassword: String? by project
-
-                username = ossrhUsername
-                password = ossrhPassword
+        developers {
+            developer {
+                name.set("Michael Bull")
+                url.set("https://www.michael-bull.com")
             }
         }
-    }
-
-    publications.withType<MavenPublication> {
-        val targetName = this@withType.name
 
-        artifact(tasks.register("${targetName}JavadocJar", Jar::class) {
-            group = LifecycleBasePlugin.BUILD_GROUP
-            description = "Assembles a jar archive containing the Javadoc API documentation of target '$targetName'."
-            archiveClassifier.set("javadoc")
-            archiveAppendix.set(targetName)
-        })
-
-        pom {
-            name.set(project.name)
-            description.set(project.description)
-            url.set("https://github.com/michaelbull/kotlin-retry")
-            inceptionYear.set("2019")
-
-            licenses {
-                license {
-                    name.set("ISC License")
-                    url.set("https://opensource.org/licenses/isc-license.txt")
-                }
+        contributors {
+            contributor {
+                name.set("Nicolas Dermine")
+                url.set("https://github.com/nicoder")
             }
 
-            developers {
-                developer {
-                    name.set("Michael Bull")
-                    url.set("https://www.michael-bull.com")
-                }
+            contributor {
+                name.set("Thorsten Hake")
+                url.set("http://www.thorsten-hake.com/")
             }
 
-            contributors {
-                contributor {
-                    name.set("Nicolas Dermine")
-                    url.set("https://github.com/nicoder")
-                }
-
-                contributor {
-                    name.set("Thorsten Hake")
-                    url.set("http://www.thorsten-hake.com/")
-                }
-
-                contributor {
-                    name.set("gnefedev")
-                    url.set("https://github.com/gnefedev")
-                }
-
-                contributor {
-                    name.set("cherrydev")
-                    url.set("https://github.com/cherrydev")
-                }
-
-                contributor {
-                    name.set("Joose Fjällström")
-                    url.set("https://github.com/jfjallstrom")
-                }
+            contributor {
+                name.set("gnefedev")
+                url.set("https://github.com/gnefedev")
             }
 
-            scm {
-                connection.set("scm:git:https://github.com/michaelbull/kotlin-retry")
-                developerConnection.set("scm:git:git@github.com:michaelbull/kotlin-retry.git")
-                url.set("https://github.com/michaelbull/kotlin-retry")
+            contributor {
+                name.set("cherrydev")
+                url.set("https://github.com/cherrydev")
             }
 
-            issueManagement {
-                system.set("GitHub Issues")
-                url.set("https://github.com/michaelbull/kotlin-retry/issues")
+            contributor {
+                name.set("Joose Fjällström")
+                url.set("https://github.com/jfjallstrom")
             }
+        }
 
-            ciManagement {
-                system.set("GitHub Actions")
-                url.set("https://github.com/michaelbull/kotlin-retry/actions")
-            }
+        scm {
+            connection.set("scm:git:https://github.com/michaelbull/kotlin-retry")
+            developerConnection.set("scm:git:git@github.com:michaelbull/kotlin-retry.git")
+            url.set("https://github.com/michaelbull/kotlin-retry")
         }
-    }
-}
 
-signing {
-    val signingKeyId: String? by project // must be the last 8 digits of the key
-    val signingKey: String? by project
-    val signingPassword: String? by project
+        issueManagement {
+            system.set("GitHub Issues")
+            url.set("https://github.com/michaelbull/kotlin-retry/issues")
+        }
 
-    useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
-    sign(publishing.publications)
+        ciManagement {
+            system.set("GitHub Actions")
+            url.set("https://github.com/michaelbull/kotlin-retry/actions")
+        }
+    }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,13 +4,17 @@ kotlin-coroutines = "1.10.2"
 kotlin-result = "2.1.0"
 mockk = "1.13.10"
 versions-plugin = "0.52.0"
+maven-publish-plugin = "0.34.0"
 
 [libraries]
-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines" }
 kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlin-coroutines" }
 kotlin-result = { module = "com.michael-bull.kotlin-result:kotlin-result", version.ref = "kotlin-result" }
 mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
 
+# buildSrc subproject
+kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+maven-publish-plugin = { module = "com.vanniktech.maven.publish:com.vanniktech.maven.publish.gradle.plugin", version.ref = "maven-publish-plugin" }
+
 [plugins]
 versions = { id = "com.github.ben-manes.versions", version.ref = "versions-plugin" }

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,5 @@ plugins {`
`4`	`4`
`5`	`5`	`dependencies {`
`6`	`6`	`implementation(libs.kotlin.gradle.plugin)`
	`7`	`+ implementation(libs.maven.publish.plugin)`
`7`	`8`	`}`