switch to the maven-deployer plugin

Author: pschichtel

build.gradle.kts

@@ -1,10 +1,11 @@
-import io.github.zenhelix.gradle.plugin.task.PublishBundleMavenCentralTask
+import io.github.danielliu1123.deployer.PublishingType
 import pl.allegro.tech.build.axion.release.domain.PredefinedVersionCreator
 
 plugins {
     `maven-publish`
     alias(libs.plugins.axion)
-    alias(libs.plugins.mavenCentralPublish) apply false
+    alias(libs.plugins.mavenDeployer)
+    id("tel.schich.javacan.convention.root")
 }
 
 tasks.wrapper {
@@ -13,6 +14,40 @@ tasks.wrapper {
 
 description = "JavaCAN is a binding to Linux' socketcan subsystem that feels native to Java developers."
 
+private fun Project.getSecret(name: String): Provider<String> = provider {
+    val env = System.getenv(name)
+        ?.ifBlank { null }
+    if (env != null) {
+        return@provider env
+    }
+
+    val propName = name.split("_")
+        .map { it.lowercase() }
+        .joinToString(separator = "") { word ->
+            word.replaceFirstChar { it.uppercase() }
+        }
+        .replaceFirstChar { it.lowercase() }
+
+    property(propName) as String
+}
+
+deploy {
+    // dirs to upload, they will all be packaged into one bundle
+    dirs = provider {
+        allprojects
+            .map { it.layout.buildDirectory.dir("repo").get().asFile }
+            .filter { it.exists() }
+            .toList()
+    }
+    username = project.getSecret("MAVEN_CENTRAL_PORTAL_USERNAME")
+    password = project.getSecret("MAVEN_CENTRAL_PORTAL_PASSWORD")
+    publishingType = if (Constants.CI) {
+        PublishingType.WAIT_FOR_PUBLISHED
+    } else {
+        PublishingType.USER_MANAGED
+    }
+}
+
 scmVersion {
     tag {
         prefix = "javacan-"
@@ -30,6 +65,7 @@ allprojects {
     group = "tel.schich"
     version = gitVersion
 }
+val isSnapshot = project.version.toString().endsWith("-SNAPSHOT")
 
 val publishAllToMavenLocal by tasks.registering(DefaultTask::class) {
     group = "publishing"
@@ -56,22 +92,25 @@ val testAll by tasks.registering(DefaultTask::class) {
 
 val mavenCentralDeploy by tasks.registering(DefaultTask::class) {
     group = "publishing"
-    val isSnapshot = project.version.toString().endsWith("-SNAPSHOT")
-
-    if (isSnapshot) {
-        logger.lifecycle("Snapshot deployment!")
-        for (project in allprojects) {
-            val tasks = project.tasks
-                .withType<PublishToMavenRepository>()
-                .matching { it.repository.name == "mavenCentralSnapshots" }
-            dependsOn(tasks)
-        }
+
+    val repo = if (isSnapshot) {
+        Constants.SNAPSHOTS_REPO
     } else {
-        logger.lifecycle("Release deployment!")
-        for (project in allprojects) {
-            val tasks = project.tasks
-                .withType<PublishBundleMavenCentralTask>()
-            dependsOn(tasks)
+        dependsOn(tasks.deploy)
+        Constants.RELEASES_REPO
+    }
+    for (project in allprojects) {
+        val publishTasks = project.tasks
+            .withType<PublishToMavenRepository>()
+            .matching { it.repository.name == repo }
+        dependsOn(publishTasks)
+    }
+
+    doFirst {
+        if (isSnapshot) {
+            logger.lifecycle("Snapshot deployment!")
+        } else {
+            logger.lifecycle("Release deployment!")
         }
     }
 }

conventions/build.gradle.kts

@@ -9,7 +9,6 @@ repositories {
 
 dependencies {
     api(plugin(libs.plugins.dockcross))
-    implementation(plugin(libs.plugins.mavenCentralPublish))
 }
 
 fun plugin(plugin: Provider<PluginDependency>) =

conventions/src/main/kotlin/ArchDetectUtil.kt

@@ -0,0 +1,8 @@
+object Constants {
+    const val ARCH_DETECT_CONFIG = "archDetectConfiguration"
+
+    const val SNAPSHOTS_REPO = "mavenCentralSnapshots"
+    const val RELEASES_REPO = "mavenLocal"
+
+    val CI = System.getenv("CI") != null
+}

conventions/src/main/kotlin/Constants.kt

@@ -1,6 +1,7 @@
 plugins {
     `java-library`
     `java-test-fixtures`
+    id("tel.schich.javacan.convention.root")
 }
 
 val javaComponent = components["java"] as AdhocComponentWithVariants

conventions/src/main/kotlin/tel.schich.javacan.convention.base.gradle.kts

@@ -7,9 +7,7 @@ plugins {
     id("tel.schich.dockcross")
 }
 
-val ci = System.getenv("CI") != null
-
-val archDetectConfiguration = configurations.register(ARCH_DETECT_CONFIGURATION_NAME) {
+val archDetectConfiguration = configurations.register(Constants.ARCH_DETECT_CONFIG) {
     isCanBeConsumed = true
 }
 
@@ -135,7 +133,7 @@ for (target in targets) {
         image = dockcrossImage
         containerName = "dockcross-${project.name}-$classifier"
 
-        if (ci) {
+        if (Constants.CI) {
             runner(DockerRunner())
             doLast {
                 providers.exec {

conventions/src/main/kotlin/tel.schich.javacan.convention.native.gradle.kts

@@ -1,51 +1,25 @@
-import io.github.zenhelix.gradle.plugin.extension.PublishingType
-
 plugins {
     id("tel.schich.javacan.convention.base")
     signing
     `maven-publish`
-    id("io.github.zenhelix.maven-central-publish")
 }
 
-val ci = System.getenv("CI") != null
-
 java {
     withSourcesJar()
     withJavadocJar()
 }
 
-private fun Project.getSecret(name: String): Provider<String> = provider {
-    val env = System.getenv(name)
-        ?.ifBlank { null }
-    if (env != null) {
-        return@provider env
-    }
-
-    val propName = name.split("_")
-        .map { it.lowercase() }
-        .joinToString(separator = "") { word ->
-            word.replaceFirstChar { it.uppercase() }
-        }
-        .replaceFirstChar { it.lowercase() }
-
-    property(propName) as String
-}
-
-mavenCentralPortal {
-    credentials {
-        username = project.getSecret("MAVEN_CENTRAL_PORTAL_USERNAME")
-        password = project.getSecret("MAVEN_CENTRAL_PORTAL_PASSWORD")
-    }
-    publishingType = PublishingType.AUTOMATIC
-}
-
 publishing {
     repositories {
         maven {
-            name = "mavenCentralSnapshots"
+            name = Constants.SNAPSHOTS_REPO
             url = uri("https://central.sonatype.com/repository/maven-snapshots/")
             credentials(PasswordCredentials::class)
         }
+        maven {
+            name = Constants.RELEASES_REPO
+            url = layout.buildDirectory.dir("repo").get().asFile.toURI()
+        }
     }
 
     publications {
@@ -91,7 +65,7 @@ when {
             sign(publishing.publications)
         }
     }
-    !ci -> {
+    !Constants.CI -> {
         logger.lifecycle("Not running in CI, using the gpg command!")
         signing {
             useGpgCmd()

conventions/src/main/kotlin/tel.schich.javacan.convention.published.gradle.kts

@@ -0,0 +1 @@
+// yep, this is an empty plugin just to have something to pull into the root project to have access to shared code.

conventions/src/main/kotlin/tel.schich.javacan.convention.root.gradle.kts

@@ -6,7 +6,7 @@ val nativeLibs by configurations.getting
 
 dependencies {
     api(project(":core"))
-    nativeLibs(project(mapOf("path" to ":core", "configuration" to ARCH_DETECT_CONFIGURATION_NAME)))
+    nativeLibs(project(mapOf("path" to ":core", "configuration" to Constants.ARCH_DETECT_CONFIG)))
 }
 
 publishing.publications.withType<MavenPublication>().configureEach {

core-arch-detect/build.gradle.kts

@@ -6,7 +6,7 @@ val nativeLibs by configurations.getting
 
 dependencies {
     api(project(":epoll"))
-    nativeLibs(project(mapOf("path" to ":epoll", "configuration" to ARCH_DETECT_CONFIGURATION_NAME)))
+    nativeLibs(project(mapOf("path" to ":epoll", "configuration" to Constants.ARCH_DETECT_CONFIG)))
 }
 
 publishing.publications.withType<MavenPublication>().configureEach {