Central Portal support

.github/workflows/deploy.yml

@@ -4,7 +4,7 @@ on:
     types: [published]
 jobs:
   SONATYPE_UPLOAD:
-    name: Sonatype Upload
+    name: Maven Central Upload
     runs-on: ubuntu-latest
     env:
       SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
@@ -20,7 +20,7 @@ jobs:
           java-version: 17
           distribution: temurin
           cache: gradle
-      - name: Publish to Sonatype
-        run: ./gradlew deploySonatype
+      - name: Publish to Maven Central
+        run: ./gradlew deployNexus
       - name: Publish to GitHub Packages
         run: ./gradlew deployGithub

.github/workflows/snapshot.yml

@@ -23,5 +23,5 @@ jobs:
           java-version: 17
           distribution: temurin
           cache: gradle
-      - name: Publish sonatype snapshot
-        run: ./gradlew deploySonatypeSnapshot
+      - name: Publish nexus snapshot
+        run: ./gradlew deployNexusSnapshot

deployer/build.gradle.kts

@@ -3,7 +3,7 @@
 plugins {
     `kotlin-dsl`
     `java-gradle-plugin`
-    id("io.deepmedia.tools.deployer") version "0.12.0-rc1"
+    id("io.deepmedia.tools.deployer") version "0.12.0"
     kotlin("plugin.serialization") version "1.9.23"
 }
 
@@ -46,7 +46,7 @@ gradlePlugin {
 }
 
 group = "io.deepmedia.tools.deployer"
-version = "0.12.0" // on change, update both docs and README
+version = "0.13.0-rc1" // on change, update both docs and README
 
 deployer {
     verbose = true
@@ -75,15 +75,15 @@ deployer {
         // directory.set(layout.buildDirectory.get().dir("inspect"))
     }
 
-    // use "deploySonatype" to deploy to OSSRH / maven central
-    sonatypeSpec {
+    // use "deployNexus" to deploy to OSSRH / maven central
+    nexusSpec {
         auth.user = secret("SONATYPE_USER")
         auth.password = secret("SONATYPE_PASSWORD")
         syncToMavenCentral = true
     }
 
-    // use "deploySonatypeSnapshot" to deploy to sonatype snapshots repo
-    sonatypeSpec("snapshot") {
+    // use "deployNexusSnapshot" to deploy to sonatype snapshots repo
+    nexusSpec("snapshot") {
         auth.user = secret("SONATYPE_USER")
         auth.password = secret("SONATYPE_PASSWORD")
         repositoryUrl = ossrhSnapshots1
@@ -99,4 +99,22 @@ deployer {
             token = secret("GHUB_PERSONAL_ACCESS_TOKEN")
         }
     }
+
+    // Just for testing centralPortal
+    /* centralPortalSpec {
+        auth.user = secret("CENTRAL_PORTAL_USERNAME")
+        auth.password = secret("CENTRAL_PORTAL_PASSWORD")
+        allowMavenCentralSync = false
+        projectInfo.groupId.set("io.github.natario1")
+        content {
+            inherit.set(false)
+            component {
+                fromMavenPublication("pluginMaven", clone = true)
+                packaging.set("jar")
+                kotlinSources()
+                emptyDocs()
+            }
+
+        }
+    } */
 }

deployer/src/main/kotlin/io/deepmedia/tools/deployer/DeployerExtension.kt

@@ -19,6 +19,9 @@ open class DeployerExtension @Inject constructor(private val objects: ObjectFact
     internal val mavenCentralSync = objects.newInstance<SonatypeMavenCentralSync>()
     internal fun mavenCentralSync(action: Action<SonatypeMavenCentralSync>) { action.execute(mavenCentralSync) }
 
+    internal val centralPortalSettings = objects.newInstance<CentralPortalSettings>()
+    internal fun centralPortalSettings(action: Action<CentralPortalSettings>) { action.execute(centralPortalSettings) }
+
     @Deprecated("DeployerExtension now *is* the default spec. Simply use `this`.")
     val defaultSpec get() = this
 
@@ -37,6 +40,7 @@ open class DeployerExtension @Inject constructor(private val objects: ObjectFact
         registerFactory(LocalDeploySpec::class.java) { LocalDeploySpec(objects, it).apply { fallback(this@DeployerExtension) } }
         registerFactory(GithubDeploySpec::class.java) { GithubDeploySpec(objects, it).apply { fallback(this@DeployerExtension) } }
         registerFactory(SonatypeDeploySpec::class.java) { SonatypeDeploySpec(objects, it).apply { fallback(this@DeployerExtension) } }
+        registerFactory(CentralPortalDeploySpec::class.java) { CentralPortalDeploySpec(objects, it).apply { fallback(this@DeployerExtension) } }
     }
 
     private fun specName(current: String, default: String): String {
@@ -47,6 +51,7 @@ open class DeployerExtension @Inject constructor(private val objects: ObjectFact
         specs.register(specName(name, "local"), LocalDeploySpec::class.java, configure)
     }
 
+    @Deprecated("sonatypeSpec is ambiguous. Use either nexusSpec (for OSSRH) or centralPortalSpec (for Central Portal).")
     fun sonatypeSpec(name: String = "sonatype", configure: Action<SonatypeDeploySpec> = Action {  }) {
         specs.register(specName(name, "sonatype"), SonatypeDeploySpec::class.java, configure)
     }
@@ -58,4 +63,8 @@ open class DeployerExtension @Inject constructor(private val objects: ObjectFact
     fun githubSpec(name: String = "github", configure: Action<GithubDeploySpec> = Action {  }) {
         specs.register(specName(name, "github"), GithubDeploySpec::class.java, configure)
     }
+
+    fun centralPortalSpec(name: String = "centralPortal", configure: Action<CentralPortalDeploySpec> = Action { }) {
+        specs.register(specName(name, "centralPortal"), CentralPortalDeploySpec::class.java, configure)
+    }
 }

deployer/src/main/kotlin/io/deepmedia/tools/deployer/DeployerPlugin.kt

@@ -4,8 +4,9 @@ import io.deepmedia.tools.deployer.specs.GithubDeploySpec
 import io.deepmedia.tools.deployer.specs.LocalDeploySpec
 import io.deepmedia.tools.deployer.specs.SonatypeDeploySpec
 import io.deepmedia.tools.deployer.model.*
-import io.deepmedia.tools.deployer.ossrh.OssrhService
-import io.deepmedia.tools.deployer.specs.NexusDeploySpec
+import io.deepmedia.tools.deployer.central.ossrh.OssrhService
+import io.deepmedia.tools.deployer.central.portal.CentralPortalService
+import io.deepmedia.tools.deployer.specs.CentralPortalDeploySpec
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository
@@ -54,6 +55,13 @@ class DeployerPlugin : Plugin<Project> {
                     parameters.verboseLogging.set(deployer.verbose)
                 }
             }
+            if (this is CentralPortalDeploySpec) {
+                target.gradle.sharedServices.registerIfAbsent(CentralPortalService.Name, CentralPortalService::class) {
+                    parameters.timeout.set(deployer.centralPortalSettings.timeout.map { it.inWholeMilliseconds })
+                    parameters.pollingDelay.set(deployer.centralPortalSettings.pollingDelay.map { it.inWholeMilliseconds })
+                    parameters.verboseLogging.set(deployer.verbose)
+                }
+            }
 
             val deployThis = registerDeployTasks(log.child(name), this, target)
             deployAll.configure { dependsOn(deployThis) }
@@ -71,6 +79,7 @@ class DeployerPlugin : Plugin<Project> {
                     is LocalDeploySpec -> "local maven repository"
                     is SonatypeDeploySpec -> "Sonatype/Nexus repository"
                     is GithubDeploySpec -> "GitHub packages"
+                    is CentralPortalDeploySpec -> "Central Portal uploads"
                     else -> error("Unexpected spec type: ${spec::class}")
                 }
             })."

deployer/src/main/kotlin/io/deepmedia/tools/deployer/ossrh/OssrhClient.kt → deployer/src/main/kotlin/io/deepmedia/tools/deployer/central/ossrh/OssrhClient.kt

@@ -1,13 +1,11 @@
-package io.deepmedia.tools.deployer.ossrh
+package io.deepmedia.tools.deployer.central.ossrh
 
-import com.android.tools.r8.internal.Bo
 import io.ktor.client.*
 import io.ktor.client.call.*
 import io.ktor.client.engine.cio.*
 import io.ktor.client.plugins.*
 import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.request.*
-import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.serialization.kotlinx.json.*
 import kotlinx.serialization.Serializable

deployer/src/main/kotlin/io/deepmedia/tools/deployer/ossrh/OssrhInfo.kt → deployer/src/main/kotlin/io/deepmedia/tools/deployer/central/ossrh/OssrhInfo.kt

@@ -1,4 +1,4 @@
-package io.deepmedia.tools.deployer.ossrh
+package io.deepmedia.tools.deployer.central.ossrh
 
 internal data class OssrhInfo(
     val server: OssrhServer,

deployer/src/main/kotlin/io/deepmedia/tools/deployer/ossrh/OssrhInvocation.kt → deployer/src/main/kotlin/io/deepmedia/tools/deployer/central/ossrh/OssrhInvocation.kt

@@ -1,15 +1,11 @@
-package io.deepmedia.tools.deployer.ossrh
+package io.deepmedia.tools.deployer.central.ossrh
 
 import io.deepmedia.tools.deployer.Logger
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.getAndUpdate
-import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.flow.updateAndGet
-import kotlinx.coroutines.time.withTimeout
 import kotlin.time.Duration
-import kotlin.time.Duration.Companion.minutes
-import kotlin.time.Duration.Companion.seconds
 
 internal class OssrhInvocation(
     logger: Logger,

deployer/src/main/kotlin/io/deepmedia/tools/deployer/ossrh/OssrhServer.kt → deployer/src/main/kotlin/io/deepmedia/tools/deployer/central/ossrh/OssrhServer.kt

@@ -1,4 +1,4 @@
-package io.deepmedia.tools.deployer.ossrh
+package io.deepmedia.tools.deployer.central.ossrh
 
 
 // OSSRH: Nexus-powered repositories provided by Sonatype to OSS projects for

deployer/src/main/kotlin/io/deepmedia/tools/deployer/ossrh/OssrhService.kt → deployer/src/main/kotlin/io/deepmedia/tools/deployer/central/ossrh/OssrhService.kt

@@ -1,11 +1,10 @@
-package io.deepmedia.tools.deployer.ossrh
+package io.deepmedia.tools.deployer.central.ossrh
 
 import io.deepmedia.tools.deployer.Logger
 import kotlinx.coroutines.*
 import org.gradle.api.provider.Property
 import org.gradle.api.services.BuildService
 import org.gradle.api.services.BuildServiceParameters
-import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds