Add support for the new Scala 3 nightly repository (VirtusLab#3838)

Gedochao · web-flow · commit 32b11d945ced · 2025-08-29T16:56:40.000Z
* Add support for the new Scala 3 nightly repository

* Don't pass the transitive dependencies of the Scala 3 bridge to Bloop

* Rename `SonatypeUtils` as `RepositoryUtils`

* Retry new Scala 3 nightly tests on the CI &amp; only run them with Bloop while on Windows

* NIT refactor

* Don't unnecessarily re-run Scala 3 nightly tests

* Enable the new Scala 3 nightly repo when a nightly is used as the default Scala version
diff --git a/modules/build/src/main/scala/scala/build/Bloop.scala b/modules/build/src/main/scala/scala/build/Bloop.scala
@@ -82,7 +82,8 @@ object Bloop {
           Seq(
             coursier.Repositories.sonatype("snapshots"),
             coursier.Repositories.sonatypeS01("snapshots"),
-            SonatypeUtils.snapshotsRepository
+            RepositoryUtils.snapshotsRepository,
+            RepositoryUtils.scala3NightlyRepository
           ),
           Some(params),
           logger,
diff --git a/modules/build/src/main/scala/scala/build/Build.scala b/modules/build/src/main/scala/scala/build/Build.scala
@@ -987,7 +987,7 @@ object Build {
           scalaBinaryVersion = params.scalaBinaryVersion,
           scalacOptions = scalacOptions.toSeq.map(_.value),
           compilerClassPath = scalaArtifacts.compilerClassPath,
-          bridgeJarsOpt = scalaArtifacts.bridgeJarsOpt
+          bridgeJarsOpt = scalaArtifacts.bridgeJarsOpt.map(_.headOption.toSeq)
         )
         Some(compilerParams)
 
diff --git a/modules/build/src/test/scala/scala/build/tests/BuildOptionsTests.scala b/modules/build/src/test/scala/scala/build/tests/BuildOptionsTests.scala
@@ -26,7 +26,7 @@ import scala.build.options.{
   ScalacOpt,
   ShadowingSeq
 }
-import scala.build.{Build, BuildThreads, Directories, LocalRepo, Positioned, SonatypeUtils}
+import scala.build.{Build, BuildThreads, Directories, LocalRepo, Positioned, RepositoryUtils}
 import scala.build.tests.util.BloopServer
 import scala.concurrent.duration.DurationInt
 import scala.build.internal.Regexes.scala3LtsRegex
@@ -323,7 +323,12 @@ class BuildOptionsTests extends TestUtil.ScalaCliBuildSuite {
     val repositories = BuildOptions(
       internal = InternalOptions(cache = Some(cache)),
       classPathOptions =
-        ClassPathOptions(extraRepositories = Seq(coursier.Repositories.scalaIntegration.root))
+        ClassPathOptions(
+          extraRepositories = Seq(
+            coursier.Repositories.scalaIntegration.root,
+            RepositoryUtils.scala3NightlyRepository.root
+          )
+        )
     ).finalRepositories.orThrow
     val allScalaVersions = ScalaVersionUtil.allMatchingVersions(None, cache, repositories)
     for {
@@ -443,11 +448,12 @@ class BuildOptionsTests extends TestUtil.ScalaCliBuildSuite {
           .getOrElse(sys.error("cannot happen"))
         val repositories = build.options.finalRepositories.orThrow
 
-        expect(repositories.length == 4)
+        expect(repositories.length == 5)
         expect(repositories.contains(Repositories.sonatype("snapshots")))
         expect(repositories.contains(Repositories.sonatypeS01("snapshots")))
         expect(repositories.contains(Repositories.central))
-        expect(repositories.contains(SonatypeUtils.snapshotsRepository))
+        expect(repositories.contains(RepositoryUtils.snapshotsRepository))
+        expect(repositories.contains(RepositoryUtils.scala3NightlyRepository))
     }
   }
 
diff --git a/modules/cli/src/main/scala/scala/cli/commands/pgp/PgpExternalCommand.scala b/modules/cli/src/main/scala/scala/cli/commands/pgp/PgpExternalCommand.scala
@@ -18,7 +18,7 @@ import scala.build.internal.{
   FetchExternalBinary,
   Runner
 }
-import scala.build.{Logger, Positioned, SonatypeUtils, options as bo}
+import scala.build.{Logger, Positioned, RepositoryUtils, options as bo}
 import scala.cli.ScalaCli
 import scala.cli.commands.shared.{CoursierOptions, SharedJvmOptions}
 import scala.cli.commands.util.JvmUtils
@@ -187,7 +187,9 @@ object PgpExternalCommand {
         if version.endsWith("SNAPSHOT") then
           Seq(
             Repositories.sonatype("snapshots"),
-            SonatypeUtils.snapshotsRepository
+            Repositories.sonatypeS01("snapshots"),
+            RepositoryUtils.snapshotsRepository,
+            RepositoryUtils.scala3NightlyRepository
           )
         else Nil
 
diff --git a/modules/cli/src/main/scala/scala/cli/commands/publish/RepoParams.scala b/modules/cli/src/main/scala/scala/cli/commands/publish/RepoParams.scala
@@ -12,7 +12,7 @@ import java.util.concurrent.ScheduledExecutorService
 import scala.build.EitherCps.{either, value}
 import scala.build.errors.BuildException
 import scala.build.internals.ConsoleUtils.ScalaCliConsole.warnPrefix
-import scala.build.{Logger, SonatypeUtils}
+import scala.build.{Logger, RepositoryUtils}
 import scala.cli.commands.util.ScalaCliSttpBackend
 
 final case class RepoParams(
@@ -53,7 +53,7 @@ final case class RepoParams(
 
 object RepoParams {
   private val sonatypeOssrhStagingApiBase = "https://ossrh-staging-api.central.sonatype.com"
-  private val sonatypeSnapshotsBase       = s"${SonatypeUtils.snapshotsRepositoryUrl}/"
+  private val sonatypeSnapshotsBase       = s"${RepositoryUtils.snapshotsRepositoryUrl}/"
   private val sonatypeLegacyBase          = "https://oss.sonatype.org"
   private val sonatypeS01LegacyBase       = "https://s01.oss.sonatype.org"
   private def sonatypeHosts: Seq[String]  =
diff --git a/modules/cli/src/main/scala/scala/cli/internal/ScalaJsLinker.scala b/modules/cli/src/main/scala/scala/cli/internal/ScalaJsLinker.scala
@@ -13,7 +13,7 @@ import scala.build.errors.{BuildException, ScalaJsLinkingError}
 import scala.build.internal.Util.{DependencyOps, ModuleOps}
 import scala.build.internal.{ExternalBinaryParams, FetchExternalBinary, Runner, ScalaJsLinkerConfig}
 import scala.build.options.scalajs.ScalaJsLinkerOptions
-import scala.build.{Logger, Positioned, SonatypeUtils}
+import scala.build.{Logger, Positioned, RepositoryUtils}
 import scala.io.Source
 import scala.util.Properties
 
@@ -61,7 +61,9 @@ object ScalaJsLinker {
           then
             Seq(
               Repositories.sonatype("snapshots"),
-              SonatypeUtils.snapshotsRepository
+              Repositories.sonatypeS01("snapshots"),
+              RepositoryUtils.snapshotsRepository,
+              RepositoryUtils.scala3NightlyRepository
             )
           else Nil
 
diff --git a/modules/cli/src/main/scala/scala/cli/launcher/LauncherCli.scala b/modules/cli/src/main/scala/scala/cli/launcher/LauncherCli.scala
@@ -10,7 +10,7 @@ import scala.build.internal.CsLoggerUtil.CsCacheExtensions
 import scala.build.internal.{Constants, OsLibc, Runner}
 import scala.build.options.ScalaVersionUtil.fileWithTtl0
 import scala.build.options.{BuildOptions, JavaOptions}
-import scala.build.{Artifacts, Os, Positioned, SonatypeUtils}
+import scala.build.{Artifacts, Os, Positioned, RepositoryUtils}
 import scala.cli.ScalaCli
 import scala.cli.commands.shared.{CoursierOptions, LoggingOptions}
 import scala.xml.XML
@@ -24,7 +24,8 @@ object LauncherCli {
     val snapshotsRepo   = Seq(
       Repositories.central,
       Repositories.sonatype("snapshots"),
-      SonatypeUtils.snapshotsRepository
+      RepositoryUtils.snapshotsRepository,
+      RepositoryUtils.scala3NightlyRepository
     )
 
     val cliVersion: String =
@@ -83,8 +84,9 @@ object LauncherCli {
     scalaBinaryVersion: String
   ): String = {
     val cliSubPath       = s"org/virtuslab/scala-cli/cli_$scalaBinaryVersion"
-    val mavenMetadataUrl = s"${SonatypeUtils.snapshotsRepositoryUrl}/$cliSubPath/maven-metadata.xml"
-    val artifact         = Artifact(mavenMetadataUrl).withChanging(true)
+    val mavenMetadataUrl =
+      s"${RepositoryUtils.snapshotsRepositoryUrl}/$cliSubPath/maven-metadata.xml"
+    val artifact = Artifact(mavenMetadataUrl).withChanging(true)
     cache.fileWithTtl0(artifact) match {
       case Left(_) =>
         System.err.println(s"Unable to find nightly ${ScalaCli.fullRunnerName} version")
diff --git a/modules/core/src/main/scala/scala/build/RepositoryUtils.scala b/modules/core/src/main/scala/scala/build/RepositoryUtils.scala
@@ -0,0 +1,10 @@
+package scala.build
+
+import coursier.maven.MavenRepository
+
+object RepositoryUtils {
+  lazy val snapshotsRepositoryUrl     = "https://central.sonatype.com/repository/maven-snapshots"
+  lazy val snapshotsRepository        = MavenRepository(snapshotsRepositoryUrl)
+  lazy val scala3NightlyRepositoryUrl = "https://repo.scala-lang.org/artifactory/maven-nightlies"
+  lazy val scala3NightlyRepository    = MavenRepository(scala3NightlyRepositoryUrl)
+}
diff --git a/modules/core/src/main/scala/scala/build/SonatypeUtils.scala b/modules/core/src/main/scala/scala/build/SonatypeUtils.scala
diff --git a/modules/integration/src/test/scala/scala/cli/integration/CompileScalacCompatTestDefinitions.scala b/modules/integration/src/test/scala/scala/cli/integration/CompileScalacCompatTestDefinitions.scala
@@ -228,4 +228,30 @@ trait CompileScalacCompatTestDefinitions { _: CompileTestDefinitions =>
       }
     }
   }
+
+  for {
+    scalaVersion <- Seq("3.nightly", "3.8.0-RC1-bin-20250825-ee2f641-NIGHTLY")
+    withBloop    <- Seq(false, true)
+    withBloopString = if (withBloop) "with Bloop" else "scalac"
+    buildServerOpts = if (withBloop) Nil else Seq("--server=false")
+    if (!Properties.isWin || withBloop) && actualScalaVersion == Constants.scala3Next
+  }
+    test(s"sanity check for Scala $scalaVersion standard library with cc ($withBloopString)") {
+      TestUtil.retryOnCi() {
+        val input = "example.scala"
+        TestInputs(os.rel / input ->
+          s"""//> using scala $scalaVersion
+             |import language.experimental.captureChecking
+             |
+             |trait File extends caps.SharedCapability:
+             |  def count(): Int
+             |
+             |def f(file: File): IterableOnce[Int]^{file} =
+             |  Iterator(1)
+             |    .map(_ + file.count())
+             |""".stripMargin).fromRoot { root =>
+          os.proc(TestUtil.cli, "compile", input, buildServerOpts).call(cwd = root)
+        }
+      }
+    }
 }
diff --git a/modules/options/src/main/scala/scala/build/Artifacts.scala b/modules/options/src/main/scala/scala/build/Artifacts.scala
@@ -166,13 +166,15 @@ object Artifacts {
       if hasSnapshots then
         Seq(
           coursier.Repositories.sonatype("snapshots"),
-          SonatypeUtils.snapshotsRepository
+          coursier.Repositories.sonatypeS01("snapshots"),
+          RepositoryUtils.snapshotsRepository,
+          RepositoryUtils.scala3NightlyRepository
         )
       else Nil
     }
 
     val allExtraRepositories =
-      maybeSnapshotRepo ++ extraRepositories
+      (maybeSnapshotRepo ++ extraRepositories).distinct
 
     val scalaOpt = scalaArtifactsParamsOpt match {
       case Some(scalaArtifactsParams) =>
@@ -239,7 +241,7 @@ object Artifacts {
               value {
                 artifacts(
                   bridgeDependencies.map(Positioned.none),
-                  allExtraRepositories,
+                  (allExtraRepositories ++ Seq(RepositoryUtils.scala3NightlyRepository)).distinct,
                   Some(scalaArtifactsParams.params),
                   logger,
                   cache.withMessage(
@@ -431,7 +433,9 @@ object Artifacts {
               if runnerVersion.endsWith("SNAPSHOT") then
                 Seq(
                   coursier.Repositories.sonatype("snapshots"),
-                  SonatypeUtils.snapshotsRepository
+                  coursier.Repositories.sonatypeS01("snapshots"),
+                  RepositoryUtils.snapshotsRepository,
+                  RepositoryUtils.scala3NightlyRepository
                 )
               else Nil
             val runnerVersion0 =
diff --git a/modules/options/src/main/scala/scala/build/options/BuildOptions.scala b/modules/options/src/main/scala/scala/build/options/BuildOptions.scala
@@ -1,6 +1,7 @@
 package scala.build.options
 import coursier.cache.{ArchiveCache, FileCache}
 import coursier.core.{Repository, Version}
+import coursier.jvm.JavaHome
 import coursier.parse.RepositoryParser
 import coursier.util.{Artifact, Task}
 import dependency.*
@@ -20,7 +21,7 @@ import scala.build.internal.Regexes.scala3NightlyNicknameRegex
 import scala.build.internal.{Constants, OsLibc, Util}
 import scala.build.internals.EnvVar
 import scala.build.options.validation.BuildOptionsRule
-import scala.build.{Artifacts, Logger, Os, Position, Positioned, SonatypeUtils}
+import scala.build.{Artifacts, Logger, Os, Position, Positioned, RepositoryUtils}
 import scala.collection.immutable.Seq
 import scala.concurrent.Await
 import scala.concurrent.duration.*
@@ -157,7 +158,7 @@ final case class BuildOptions(
           .withScalaBinaryVersion(scalaVersion.split('.').take(2).mkString("."))
           .withInput(s"org.scalameta:semanticdb-scalac_$scalaVersion:")
           .complete()
-          .future()(finalCache.ec)
+          .future()(using finalCache.ec)
       }
 
     val versions =
@@ -245,24 +246,28 @@ final case class BuildOptions(
 
   def javaHome(): Positioned[JavaHomeInfo] = javaCommand0
 
-  lazy val javaHomeManager =
+  lazy val javaHomeManager: JavaHome =
     javaOptions.javaHomeManager(archiveCache, finalCache, internal.verbosityOrDefault)
 
   private val scala2NightlyRepo = Seq(coursier.Repositories.scalaIntegration.root)
+  private val scala3NightlyRepo = Seq(RepositoryUtils.scala3NightlyRepository.root)
 
   def finalRepositories: Either[BuildException, Seq[Repository]] = either {
+    val maybeSv = scalaOptions.scalaVersion
+      .map(_.asString)
+      .orElse(scalaOptions.defaultScalaVersion)
     val nightlyRepos =
-      if (scalaOptions.scalaVersion.exists(sv => ScalaVersionUtil.isScala2Nightly(sv.asString)))
-        scala2NightlyRepo
-      else
-        Nil
+      if maybeSv.exists(ScalaVersionUtil.isScala2Nightly) then scala2NightlyRepo
+      else if maybeSv.exists(ScalaVersionUtil.isScala3Nightly) then scala3NightlyRepo
+      else Nil
     val snapshotRepositories =
       if classPathOptions.extraRepositories.contains("snapshots")
       then
         Seq(
           coursier.Repositories.sonatype("snapshots"),
           coursier.Repositories.sonatypeS01("snapshots"),
-          SonatypeUtils.snapshotsRepository
+          RepositoryUtils.snapshotsRepository,
+          RepositoryUtils.scala3NightlyRepository
         )
       else Nil
     val extraRepositories = classPathOptions.extraRepositories.filterNot(_ == "snapshots")
@@ -277,7 +282,7 @@ final case class BuildOptions(
         .left.map(errors => new RepositoryFormatError(errors))
     }
 
-    parseRepositories ++ snapshotRepositories
+    (parseRepositories ++ snapshotRepositories).distinct
   }
 
   lazy val scalaParams: Either[BuildException, Option[ScalaParameters]] = either {
@@ -363,7 +368,8 @@ final case class BuildOptions(
               case versionString if ScalaVersionUtil.isScala3Nightly(versionString) =>
                 ScalaVersionUtil.CheckNightly.scala3(
                   versionString,
-                  cache
+                  cache,
+                  repositories
                 )
                   .map(_ => versionString)
               case versionString if ScalaVersionUtil.isScala2Nightly(versionString) =>
@@ -456,7 +462,8 @@ final case class BuildOptions(
       if (scalaArtifactsParamsOpt.isDefined) None
       else Some(false) // no runner in pure Java mode
     }
-    val maybeArtifacts = Artifacts(
+    val extraRepositories: Seq[Repository] = value(finalRepositories)
+    val maybeArtifacts                     = Artifacts(
       scalaArtifactsParamsOpt,
       javacPluginDependencies = value(javacPluginDependencies),
       extraJavacPlugins = javaOptions.javacPlugins.map(_.value),
@@ -470,7 +477,7 @@ final case class BuildOptions(
       addJvmRunner = addRunnerDependency0,
       addJvmTestRunner = isTests && addJvmTestRunner,
       addJmhDependencies = jmhOptions.finalJmhVersion,
-      extraRepositories = value(finalRepositories),
+      extraRepositories = extraRepositories,
       keepResolution = internal.keepResolution,
       includeBuildServerDeps = useBuildServer.getOrElse(true),
       cache = finalCache,
diff --git a/modules/options/src/main/scala/scala/build/options/ScalaVersionUtil.scala b/modules/options/src/main/scala/scala/build/options/ScalaVersionUtil.scala

Original file line number	Diff line number	Diff line change
`@@ -987,7 +987,7 @@ object Build {`
`987`	`987`	`scalaBinaryVersion = params.scalaBinaryVersion,`
`988`	`988`	`scalacOptions = scalacOptions.toSeq.map(_.value),`
`989`	`989`	`compilerClassPath = scalaArtifacts.compilerClassPath,`
`990`		`- bridgeJarsOpt = scalaArtifacts.bridgeJarsOpt`
	`990`	`+ bridgeJarsOpt = scalaArtifacts.bridgeJarsOpt.map(_.headOption.toSeq)`
`991`	`991`	`)`
`992`	`992`	`Some(compilerParams)`
`993`	`993`