Fix missing sonatype requirements test

Author: Gedochao

modules/cli/src/main/scala/scala/cli/commands/publish/Publish.scala

@@ -425,7 +425,7 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
     now: Instant,
     isIvy2LocalLike: Boolean,
     isCi: Boolean,
-    isLegacySonatype: Boolean,
+    isSonatype: Boolean,
     withTestScope: Boolean,
     logger: Logger
   ): Either[BuildException, (FileSet, (coursier.core.Module, String))] = either {
@@ -540,7 +540,7 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
       developers = developers
     )
 
-    if isLegacySonatype then {
+    if isSonatype then {
       if url.isEmpty then
         logger.diagnostic(
           "Publishing to Sonatype, but project URL is empty (set it with the '//> using publish.url' directive)."
@@ -750,7 +750,7 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
               now = now,
               isIvy2LocalLike = repoParams.isIvy2LocalLike,
               isCi = isCi,
-              isLegacySonatype = repoParams.isLegacySonatype,
+              isSonatype = repoParams.isSonatype,
               withTestScope = withTestScope,
               logger = logger
             )
@@ -878,7 +878,7 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
     val isSnapshot0 = modVersionOpt.exists(_._2.endsWith("SNAPSHOT"))
     val authOpt0    = value(authOpt(
       repo = repoParams.repo.repo(isSnapshot0).root,
-      isLegacySonatype = repoParams.isLegacySonatype
+      isLegacySonatype = repoParams.isSonatype
     ))
     val asciiRegex        = """[\u0000-\u007f]*""".r
     val usernameOnlyAscii = authOpt0.exists(auth => asciiRegex.matches(auth.user))
@@ -891,7 +891,7 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
       )
     val repoParams0: RepoParams = repoParams.withAuth(authOpt0)
     val isLegacySonatype        =
-      repoParams0.isLegacySonatype && !repoParams0.repo.releaseRepo.root.contains("s01")
+      repoParams0.isSonatype && !repoParams0.repo.releaseRepo.root.contains("s01")
     val hooksDataOpt = Option.when(!dummy) {
       try repoParams0.hooks.beforeUpload(finalFileSet, isSnapshot0).unsafeRun()(using ec)
       catch {
@@ -953,7 +953,7 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
 
     errors.toList match {
       case (h @ (_, _, e: Upload.Error.HttpError)) :: _
-          if repoParams0.isLegacySonatype && errors.distinctBy(_._3.getMessage()).size == 1 =>
+          if repoParams0.isSonatype && errors.distinctBy(_._3.getMessage()).size == 1 =>
         val httpCodeRegex = "HTTP (\\d+)\n.*".r
         e.getMessage match {
           case httpCodeRegex("403") =>
@@ -968,7 +968,7 @@ object Publish extends ScalaCommand[PublishOptions] with BuildCommandHelpers {
             )
           case _ => throw new UploadError(::(h, Nil))
         }
-      case _ :: _ if repoParams0.isLegacySonatype && errors.forall {
+      case _ :: _ if repoParams0.isSonatype && errors.forall {
             case (_, _, _: Upload.Error.Unauthorized) => true
             case _                                    => false
           } =>

modules/cli/src/main/scala/scala/cli/commands/publish/RepoParams.scala

@@ -26,6 +26,8 @@ final case class RepoParams(
   shouldSign: Boolean,
   shouldAuthenticate: Boolean
 ) {
+  import RepoParams.*
+
   def withAuth(auth: Authentication): RepoParams =
     copy(
       repo = repo.withAuthentication(auth),
@@ -42,14 +44,26 @@ final case class RepoParams(
     )
   def withAuth(authOpt: Option[Authentication]): RepoParams = authOpt.fold(this)(withAuth)
 
-  lazy val isLegacySonatype: Boolean =
+  lazy val isSonatype: Boolean =
     Option(new URI(repo.snapshotRepo.root))
       .filter(_.getScheme == "https")
       .map(_.getHost)
-      .exists(host => host == "oss.sonatype.org" || host.endsWith(".oss.sonatype.org"))
+      .exists(sonatypeHosts.contains)
 }
 
 object RepoParams {
+  private val sonatypeOssrhStagingApiBase = "https://ossrh-staging-api.central.sonatype.com"
+  private val sonatypeSnapshotsBase = "https://central.sonatype.com/repository/maven-snapshots/"
+  private val sonatypeLegacyBase    = "https://oss.sonatype.org"
+  private val sonatypeS01LegacyBase = "https://s01.oss.sonatype.org"
+  private def sonatypeHosts: Seq[String] =
+    Seq(
+      sonatypeLegacyBase,
+      sonatypeSnapshotsBase,
+      sonatypeS01LegacyBase,
+      sonatypeOssrhStagingApiBase
+    ).map(new URI(_).getHost)
+
   def apply(
     repo: String,
     vcsUrlOpt: Option[String],
@@ -67,10 +81,9 @@ object RepoParams {
       case "ivy2-local" =>
         RepoParams.ivy2Local(ivy2HomeOpt)
       case "sonatype" | "central" | "maven-central" | "mvn-central" =>
-        val ossrhStagingApiBase = "https://ossrh-staging-api.central.sonatype.com"
-        logger.message(s"Using Portal OSSRH Staging API: $ossrhStagingApiBase")
+        logger.message(s"Using Portal OSSRH Staging API: $sonatypeOssrhStagingApiBase")
         RepoParams.centralRepo(
-          base = ossrhStagingApiBase,
+          base = sonatypeOssrhStagingApiBase,
           useLegacySnapshots = false,
           connectionTimeoutRetries = connectionTimeoutRetries,
           connectionTimeoutSeconds = connectionTimeoutSeconds,
@@ -80,11 +93,10 @@ object RepoParams {
           logger = logger
         )
       case "sonatype-legacy" | "central-legacy" | "maven-central-legacy" | "mvn-central-legacy" =>
-        val legacyBase = "https://oss.sonatype.org"
-        logger.message(s"$warnPrefix $legacyBase is EOL since 2025-06-30.")
-        logger.message(s"$warnPrefix $legacyBase publishing is expected to fail.")
+        logger.message(s"$warnPrefix $sonatypeLegacyBase is EOL since 2025-06-30.")
+        logger.message(s"$warnPrefix $sonatypeLegacyBase publishing is expected to fail.")
         RepoParams.centralRepo(
-          base = legacyBase,
+          base = sonatypeLegacyBase,
           useLegacySnapshots = true,
           connectionTimeoutRetries = connectionTimeoutRetries,
           connectionTimeoutSeconds = connectionTimeoutSeconds,
@@ -94,11 +106,10 @@ object RepoParams {
           logger = logger
         )
       case "sonatype-s01" | "central-s01" | "maven-central-s01" | "mvn-central-s01" =>
-        val s01SonatypeLegacyBase = "https://s01.oss.sonatype.org"
-        logger.message(s"$warnPrefix $s01SonatypeLegacyBase is EOL since 2025-06-30.")
+        logger.message(s"$warnPrefix $sonatypeS01LegacyBase is EOL since 2025-06-30.")
         logger.message(s"$warnPrefix it's expected publishing will fail.")
         RepoParams.centralRepo(
-          base = s01SonatypeLegacyBase,
+          base = sonatypeS01LegacyBase,
           useLegacySnapshots = true,
           connectionTimeoutRetries = connectionTimeoutRetries,
           connectionTimeoutSeconds = connectionTimeoutSeconds,