Migrate publishing to Sonatype Maven Central (#3704)

* Fix passing environment variables to the Sonatype publisher

* Migrate publishing to Sonatype Maven Central

Author: Gedochao

build.mill.scala

@@ -4,6 +4,7 @@ import $packages._
 import $ivy.`com.lihaoyi::mill-contrib-bloop:$MILL_VERSION`
 import $ivy.`io.get-coursier::coursier-launcher:2.1.24`
 import $ivy.`io.github.alexarchambault.mill::mill-native-image-upload:0.1.31-1`
+import build.ci.publishVersion
 import build.project.deps
 import deps.{Cli, Deps, Docker, InternalDeps, Java, Scala, TestDeps}
 import build.project.publish
@@ -386,7 +387,7 @@ trait Core extends ScalaCliCrossSbtModule
     with ScalaCliScalafixModule {
   def crossScalaVersion: String = crossValue
 
-  def moduleDeps: Seq[PublishModule] = Seq(
+  def moduleDeps: Seq[SonatypeCentralPublishModule] = Seq(
     config(crossScalaVersion)
   )
   def compileModuleDeps: Seq[JavaModule] = Seq(
@@ -577,8 +578,8 @@ trait Directives extends ScalaCliCrossSbtModule
     with ScalaCliPublishModule
     with HasTests
     with ScalaCliScalafixModule {
-  def crossScalaVersion: String      = crossValue
-  def moduleDeps: Seq[PublishModule] = Seq(
+  def crossScalaVersion: String                     = crossValue
+  def moduleDeps: Seq[SonatypeCentralPublishModule] = Seq(
     options(crossScalaVersion),
     core(crossScalaVersion),
     `build-macros`(crossScalaVersion),
@@ -639,9 +640,9 @@ trait Directives extends ScalaCliCrossSbtModule
 trait Config extends ScalaCliCrossSbtModule
     with ScalaCliPublishModule
     with ScalaCliScalafixModule {
-  def crossScalaVersion: String      = crossValue
-  def moduleDeps: Seq[PublishModule] = Seq(`specification-level`(crossScalaVersion))
-  def ivyDeps: Target[Agg[Dep]]      = {
+  def crossScalaVersion: String                     = crossValue
+  def moduleDeps: Seq[SonatypeCentralPublishModule] = Seq(`specification-level`(crossScalaVersion))
+  def ivyDeps: Target[Agg[Dep]]                     = {
     val maybeCollectionCompat =
       if (crossScalaVersion.startsWith("2.12.")) Seq(Deps.collectionCompat)
       else Nil
@@ -666,8 +667,8 @@ trait Config extends ScalaCliCrossSbtModule
 
 trait Options extends ScalaCliCrossSbtModule with ScalaCliPublishModule with HasTests
     with ScalaCliScalafixModule {
-  def crossScalaVersion: String      = crossValue
-  def moduleDeps: Seq[PublishModule] = Seq(
+  def crossScalaVersion: String                     = crossValue
+  def moduleDeps: Seq[SonatypeCentralPublishModule] = Seq(
     core(crossScalaVersion)
   )
   def compileModuleDeps: Seq[JavaModule] = Seq(
@@ -723,17 +724,17 @@ trait Scala3Graal extends ScalaCliCrossSbtModule
 }
 
 trait Scala3GraalProcessor extends CrossScalaModule with ScalaCliPublishModule {
-  def moduleDeps: Seq[PublishModule] = Seq(`scala3-graal`(crossScalaVersion))
-  def finalMainClass: Target[String] = "scala.cli.graal.CoursierCacheProcessor"
+  def moduleDeps: Seq[SonatypeCentralPublishModule] = Seq(`scala3-graal`(crossScalaVersion))
+  def finalMainClass: Target[String]                = "scala.cli.graal.CoursierCacheProcessor"
 }
 
 trait Build extends ScalaCliCrossSbtModule
     with ScalaCliPublishModule
     with HasTests
     with ScalaCliScalafixModule {
-  def crossScalaVersion: String      = crossValue
-  def millSourcePath: os.Path        = super.millSourcePath / os.up / "build"
-  def moduleDeps: Seq[PublishModule] = Seq(
+  def crossScalaVersion: String                     = crossValue
+  def millSourcePath: os.Path                       = super.millSourcePath / os.up / "build"
+  def moduleDeps: Seq[SonatypeCentralPublishModule] = Seq(
     options(crossScalaVersion),
     directives(crossScalaVersion),
     `scala-cli-bsp`,
@@ -931,7 +932,7 @@ trait Cli extends CrossSbtModule with ProtoBuildModule with CliLaunchers
   def javacOptions: Target[Seq[String]] = Task {
     super.javacOptions() ++ Seq("--release", "16")
   }
-  def moduleDeps: Seq[PublishModule] = Seq(
+  def moduleDeps: Seq[SonatypeCentralPublishModule] = Seq(
     `build-module`(crossScalaVersion),
     config(crossScalaVersion),
     `scala3-graal`(crossScalaVersion),
@@ -1343,10 +1344,16 @@ object `local-repo` extends LocalRepo {
 
 // Helper CI commands
 def publishSonatype(tasks: mill.main.Tasks[PublishModule.PublishData]) = Task.Command {
+  val pv = publishVersion()
+  System.err.println(s"Publish version: $pv")
+  val bundleName = s"$organization-$ghName-$pv"
+  System.err.println(s"Publishing bundle: $bundleName")
   publish.publishSonatype(
     data = define.Target.sequence(tasks.value)(),
     log = Task.ctx().log,
-    workspace = Task.workspace
+    workspace = Task.workspace,
+    env = Task.env,
+    bundleName = bundleName
   )
 }
 

project/publish/package.mill.scala

@@ -1,14 +1,15 @@
 package build.project.publish
 import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0`
 import $ivy.`org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r`
-import build.project.settings, settings.{PublishLocalNoFluff, workspaceDirName}
-
+import build.project.settings
+import com.lumidion.sonatype.central.client.core.{PublishingType, SonatypeCredentials}
+import settings.{PublishLocalNoFluff, workspaceDirName}
 import de.tobiasroeser.mill.vcs.version._
-import mill._, scalalib._
+import mill._
+import scalalib._
 import org.eclipse.jgit.api.Git
 
 import java.nio.charset.Charset
-
 import scala.concurrent.duration._
 import scala.jdk.CollectionConverters._
 
@@ -121,7 +122,7 @@ def finalPublishVersion: Target[String] = {
 
 def organization = "org.virtuslab.scala-cli"
 
-trait ScalaCliPublishModule extends PublishModule with PublishLocalNoFluff {
+trait ScalaCliPublishModule extends SonatypeCentralPublishModule with PublishLocalNoFluff {
   import mill.scalalib.publish._
   def pomSettings: Target[PomSettings] = PomSettings(
     description = artifactName(),
@@ -154,10 +155,14 @@ trait ScalaCliPublishModule extends PublishModule with PublishLocalNoFluff {
 def publishSonatype(
   data: Seq[PublishModule.PublishData],
   log: mill.api.Logger,
-  workspace: os.Path
+  workspace: os.Path,
+  env: Map[String, String],
+  bundleName: String
 ): Unit = {
-
-  val credentials = sys.env("SONATYPE_USERNAME") + ":" + sys.env("SONATYPE_PASSWORD")
+  val credentials = SonatypeCredentials(
+    username = sys.env("SONATYPE_USERNAME"),
+    password = sys.env("SONATYPE_PASSWORD")
+  )
   val pgpPassword = sys.env("PGP_PASSWORD")
   val timeout     = 10.minutes
 
@@ -166,7 +171,7 @@ def publishSonatype(
       (s.map { case (p, f) => (p.path, f) }, a)
   }
 
-  val isRelease = {
+  val isRelease: Boolean = {
     val versions = artifacts.map(_._2.version).toSet
     val set      = versions.map(!_.endsWith("-SNAPSHOT"))
     assert(
@@ -175,11 +180,8 @@ def publishSonatype(
     )
     set.head
   }
-  val publisher = new scalalib.publish.SonatypePublisher(
-    uri = "https://oss.sonatype.org/service/local",
-    snapshotUri = "https://oss.sonatype.org/content/repositories/snapshots",
+  val publisher = new SonatypeCentralPublisher(
     credentials = credentials,
-    signed = true,
     gpgArgs = Seq(
       "--detach-sign",
       "--batch=true",
@@ -195,12 +197,16 @@ def publishSonatype(
     connectTimeout = timeout.toMillis.toInt,
     log = log,
     workspace = workspace,
-    env = sys.env,
-    awaitTimeout = timeout.toMillis.toInt,
-    stagingRelease = isRelease
+    env = env,
+    awaitTimeout = timeout.toMillis.toInt
+  )
+  val publishingType  = if (isRelease) PublishingType.AUTOMATIC else PublishingType.USER_MANAGED
+  val finalBundleName = if (bundleName.nonEmpty) Some(bundleName) else None
+  publisher.publishAll(
+    publishingType = publishingType,
+    singleBundleName = finalBundleName,
+    artifacts = artifacts: _*
   )
-
-  publisher.publishAll(isRelease, artifacts: _*)
 }
 
 // from https://github.com/sbt/sbt-ci-release/blob/35b3d02cc6c247e1bb6c10dd992634aa8b3fe71f/plugin/src/main/scala/com/geirsson/CiReleasePlugin.scala#L33-L39

project/settings/package.mill.scala

@@ -545,7 +545,7 @@ trait HasTests extends SbtModule {
   }
 }
 
-trait PublishLocalNoFluff extends PublishModule {
+trait PublishLocalNoFluff extends SonatypeCentralPublishModule {
   def emptyZip: Target[PathRef] = Task {
     import java.io._
     import java.util.zip._