Add repositories from build options when validating scala versions

lwronski · Gedochao · lwronski · commit 235edd4eb1bd · 2022-12-01T16:15:21.000+01:00
Co-authored-by: Piotr Chabelski &lt;ged.subfan@gmail.com&gt;
diff --git a/modules/build/src/main/scala/scala/build/LocalRepo.scala b/modules/build/src/main/scala/scala/build/LocalRepo.scala
@@ -1,15 +1,17 @@
 package scala.build
 
+import coursier.core.{Repository, Version}
+import coursier.parse.RepositoryParser
 import coursier.paths.Util
 
 import java.io.{BufferedInputStream, Closeable}
 import java.nio.channels.{FileChannel, FileLock}
 import java.nio.charset.StandardCharsets
 import java.nio.file.{Path, StandardOpenOption}
 
+import scala.build.errors.{BuildException, RepositoryFormatError}
 import scala.build.internal.Constants
 import scala.build.internal.zip.WrappedZipInputStream
-
 object LocalRepo {
 
   private def resourcePath = Constants.localRepoResourcePath
diff --git a/modules/build/src/main/scala/scala/build/ReplArtifacts.scala b/modules/build/src/main/scala/scala/build/ReplArtifacts.scala
@@ -1,6 +1,7 @@
 package scala.build
 
 import coursier.cache.FileCache
+import coursier.core.{Repository, Version}
 import coursier.util.Task
 import dependency._
 
@@ -42,25 +43,25 @@ object ReplArtifacts {
     dependencies: Seq[AnyDependency],
     extraClassPath: Seq[os.Path],
     extraSourceJars: Seq[os.Path],
+    extraRepositories: Seq[Repository],
     logger: Logger,
     cache: FileCache[Task],
     directories: Directories,
     addScalapy: Option[String]
   ): Either[BuildException, ReplArtifacts] = either {
-    val localRepoOpt = LocalRepo.localRepo(directories.localRepoDir)
     val scalapyDeps =
       addScalapy.map(ver => dep"${Artifacts.scalaPyOrganization(ver)}::scalapy-core::$ver").toSeq
     val allDeps = dependencies ++ Seq(dep"com.lihaoyi:::ammonite:$ammoniteVersion") ++ scalapyDeps
     val replArtifacts = Artifacts.artifacts(
       Positioned.none(allDeps),
-      localRepoOpt.toSeq,
+      extraRepositories,
       Some(scalaParams),
       logger,
       cache.withMessage(s"Downloading Ammonite $ammoniteVersion")
     )
     val replSourceArtifacts = Artifacts.artifacts(
       Positioned.none(allDeps),
-      localRepoOpt.toSeq,
+      extraRepositories,
       Some(scalaParams),
       logger,
       cache.withMessage(s"Downloading Ammonite $ammoniteVersion sources"),
@@ -82,7 +83,7 @@ object ReplArtifacts {
     extraClassPath: Seq[os.Path],
     logger: Logger,
     cache: FileCache[Task],
-    repositories: Seq[String],
+    repositories: Seq[Repository],
     addScalapy: Option[String]
   ): Either[BuildException, ReplArtifacts] = either {
     val isScala2 = scalaParams.scalaVersion.startsWith("2.")
diff --git a/modules/build/src/test/scala/scala/build/tests/ReplArtifactsTests.scala b/modules/build/src/test/scala/scala/build/tests/ReplArtifactsTests.scala
@@ -16,6 +16,7 @@ class ReplArtifactsTests extends munit.FunSuite {
         Nil,
         Nil,
         Nil,
+        Nil,
         Logger.nop,
         FileCache(),
         Directories.under(root),
diff --git a/modules/cli/src/main/scala/scala/cli/commands/ScalaCommand.scala b/modules/cli/src/main/scala/scala/cli/commands/ScalaCommand.scala
@@ -7,6 +7,7 @@ import caseapp.core.help.{Help, HelpFormat}
 import caseapp.core.parser.Parser
 import caseapp.core.util.Formatter
 import caseapp.core.{Arg, Error, RemainingArgs}
+import coursier.core.{Repository, Version}
 import dependency.*
 
 import scala.annotation.tailrec
@@ -180,7 +181,7 @@ abstract class ScalaCommand[T <: HasLoggingOptions](implicit myParser: Parser[T]
             val docArtifacts = value {
               Artifacts.fetch(
                 Positioned.none(Seq(dep"org.scala-lang::scaladoc:${scalaParams.scalaVersion}")),
-                buildOptions.finalRepositories,
+                value(buildOptions.finalRepositories),
                 Some(scalaParams),
                 logger,
                 buildOptions.finalCache,
@@ -211,7 +212,7 @@ abstract class ScalaCommand[T <: HasLoggingOptions](implicit myParser: Parser[T]
                 Positioned.none(Seq(
                   dep"${Constants.scalafmtOrganization}:${Constants.scalafmtName}:${Constants.defaultScalafmtVersion}"
                 )),
-                buildOptions.finalRepositories,
+                value(buildOptions.finalRepositories),
                 Some(scalaParams),
                 logger,
                 buildOptions.finalCache,
diff --git a/modules/cli/src/main/scala/scala/cli/commands/doc/Doc.scala b/modules/cli/src/main/scala/scala/cli/commands/doc/Doc.scala
@@ -138,7 +138,7 @@ object Doc extends ScalaCommand[DocOptions] {
         val res = value {
           Artifacts.fetch(
             Positioned.none(Seq(dep"org.scala-lang::scaladoc:${scalaParams.scalaVersion}")),
-            build.options.finalRepositories,
+            value(build.options.finalRepositories),
             Some(scalaParams),
             logger,
             build.options.finalCache,
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
@@ -139,7 +139,7 @@ object PgpExternalCommand {
     if (signingCliOptions.useJvm.getOrElse(false)) {
       val extraRepos =
         if (version.endsWith("SNAPSHOT"))
-          Seq(Repositories.sonatype("snapshots").root)
+          Seq(Repositories.sonatype("snapshots"))
         else
           Nil
 
diff --git a/modules/cli/src/main/scala/scala/cli/commands/repl/Repl.scala b/modules/cli/src/main/scala/scala/cli/commands/repl/Repl.scala
@@ -371,26 +371,30 @@ object Repl extends ScalaCommand[ReplOptions] {
           value(Left(new ReplError(retCode)))
       }
 
-    def defaultArtifacts(): Either[BuildException, ReplArtifacts] =
-      ReplArtifacts.default(
-        scalaParams,
-        artifacts.userDependencies,
-        artifacts.extraClassPath,
-        logger,
-        cache,
-        options.finalRepositories,
-        addScalapy =
-          if (setupPython)
-            Some(options.notForBloopOptions.scalaPyVersion.getOrElse(Constants.scalaPyVersion))
-          else None
-      )
+    def defaultArtifacts(): Either[BuildException, ReplArtifacts] = either {
+      value {
+        ReplArtifacts.default(
+          scalaParams,
+          artifacts.userDependencies,
+          artifacts.extraClassPath,
+          logger,
+          cache,
+          value(options.finalRepositories),
+          addScalapy =
+            if (setupPython)
+              Some(options.notForBloopOptions.scalaPyVersion.getOrElse(Constants.scalaPyVersion))
+            else None
+        )
+      }
+    }
     def ammoniteArtifacts(): Either[BuildException, ReplArtifacts] =
       ReplArtifacts.ammonite(
         scalaParams,
         options.notForBloopOptions.replOptions.ammoniteVersion,
         artifacts.userDependencies,
         artifacts.extraClassPath,
         artifacts.extraSourceJars,
+        value(options.finalRepositories),
         logger,
         cache,
         directories,
diff --git a/modules/cli/src/main/scala/scala/cli/internal/ScalaJsLinker.scala b/modules/cli/src/main/scala/scala/cli/internal/ScalaJsLinker.scala
@@ -53,7 +53,7 @@ object ScalaJsLinker {
 
         val extraRepos =
           if (scalaJsVersion.endsWith("SNAPSHOT") || scalaJsCliVersion.endsWith("SNAPSHOT"))
-            Seq(Repositories.sonatype("snapshots").root)
+            Seq(Repositories.sonatype("snapshots"))
           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
@@ -24,7 +24,7 @@ object LauncherCli {
     val cache           = CoursierOptions().coursierCache(logger.coursierLogger(""))
     val scalaVersion    = options.cliScalaVersion.getOrElse(scalaCliScalaVersion(version))
     val scalaParameters = ScalaParameters(scalaVersion)
-    val snapshotsRepo   = Seq(Repositories.central.root, Repositories.sonatype("snapshots").root)
+    val snapshotsRepo   = Seq(Repositories.central, Repositories.sonatype("snapshots"))
 
     val cliVersion: String =
       if (version == "nightly") resolveNightlyScalaCliVersion(cache, scalaParameters) else version
diff --git a/modules/integration/src/test/scala/scala/cli/integration/RunTests213.scala b/modules/integration/src/test/scala/scala/cli/integration/RunTests213.scala
@@ -7,6 +7,25 @@ class RunTests213 extends RunTestDefinitions(
   scalaVersionOpt = Some(Constants.scala213)
 ){
 // format: on
+  test("ensure typesafe PR validation snapshot Scala versions are supported") {
+    TestInputs(os.rel / "sample.sc" -> "println(util.Properties.versionNumberString)").fromRoot {
+      root =>
+        val snapshotScalaVersion = "2.13.11-bin-89f3de5-SNAPSHOT"
+        val res =
+          os.proc(
+            TestUtil.cli,
+            "run",
+            ".",
+            "--repository",
+            "https://scala-ci.typesafe.com/artifactory/scala-pr-validation-snapshots",
+            "-S",
+            snapshotScalaVersion,
+            TestUtil.extraOptions
+          )
+            .call(cwd = root)
+        expect(res.out.trim() == "2.13.11-20221128-143922-89f3de5")
+    }
+  }
   test("2.13.nightly") {
     TestInputs(os.rel / "sample.sc" -> "println(util.Properties.versionNumberString)").fromRoot {
       root =>
diff --git a/modules/options/src/main/scala/scala/build/Artifacts.scala b/modules/options/src/main/scala/scala/build/Artifacts.scala
@@ -1,7 +1,7 @@
 package scala.build
 
 import coursier.cache.FileCache
-import coursier.core.{Classifier, Module, ModuleName, Organization}
+import coursier.core.{Classifier, Module, ModuleName, Organization, Repository, Version}
 import coursier.parse.RepositoryParser
 import coursier.util.Task
 import coursier.{Dependency => CsDependency, Fetch, Resolution, core => csCore, util => csUtil}
@@ -92,7 +92,7 @@ object Artifacts {
     addJvmRunner: Option[Boolean],
     addJvmTestRunner: Boolean,
     addJmhDependencies: Option[String],
-    extraRepositories: Seq[String],
+    extraRepositories: Seq[Repository],
     keepResolution: Boolean,
     cache: FileCache[Task],
     logger: Logger,
@@ -113,7 +113,7 @@ object Artifacts {
       val hasSnapshots = jvmTestRunnerDependencies.exists(_.version.endsWith("SNAPSHOT")) ||
         scalaArtifactsParamsOpt.flatMap(_.scalaNativeCliVersion).exists(_.endsWith("SNAPSHOT"))
       if (hasSnapshots)
-        Seq(coursier.Repositories.sonatype("snapshots").root)
+        Seq(coursier.Repositories.sonatype("snapshots"))
       else
         Nil
     }
@@ -347,7 +347,7 @@ object Artifacts {
           if (addJvmRunner0) {
             val maybeSnapshotRepo =
               if (runnerVersion.endsWith("SNAPSHOT"))
-                Seq(coursier.Repositories.sonatype("snapshots").root)
+                Seq(coursier.Repositories.sonatype("snapshots"))
               else Nil
             value {
               artifacts(
@@ -415,7 +415,7 @@ object Artifacts {
 
   private[build] def artifacts(
     dependencies: Positioned[Seq[AnyDependency]],
-    extraRepositories: Seq[String],
+    extraRepositories: Seq[Repository],
     paramsOpt: Option[ScalaParameters],
     logger: Logger,
     cache: FileCache[Task],
@@ -439,7 +439,7 @@ object Artifacts {
 
   def fetch(
     dependencies: Positioned[Seq[AnyDependency]],
-    extraRepositories: Seq[String],
+    extraRepositories: Seq[Repository],
     paramsOpt: Option[ScalaParameters],
     logger: Logger,
     cache: FileCache[Task],
@@ -488,7 +488,7 @@ object Artifacts {
 
   def fetch0(
     dependencies: Positioned[Seq[coursier.Dependency]],
-    extraRepositories: Seq[String],
+    extraRepositories: Seq[Repository],
     forceScalaVersionOpt: Option[String],
     forcedVersions: Seq[(coursier.Module, String)],
     logger: Logger,
@@ -501,15 +501,8 @@ object Artifacts {
         (if (extraRepositories.isEmpty) "" else s", adding $extraRepositories")
     }
 
-    val fallbackRepository = TemporaryInMemoryRepository(fallbacks)
-
-    val extraRepositories0 = value {
-      RepositoryParser.repositories(extraRepositories)
-        .either
-        .left.map(errors => new RepositoryFormatError(errors))
-    }
-
-    val extraRepositoriesWithFallback = extraRepositories0 :+ fallbackRepository
+    val fallbackRepository            = TemporaryInMemoryRepository(fallbacks)
+    val extraRepositoriesWithFallback = extraRepositories :+ fallbackRepository
 
     val forceScalaVersions = forceScalaVersionOpt match {
       case None => Nil
diff --git a/modules/options/src/main/scala/scala/build/internal/ExternalBinaryParams.scala b/modules/options/src/main/scala/scala/build/internal/ExternalBinaryParams.scala
@@ -1,11 +1,13 @@
 package scala.build.internal
 
+import coursier.core.Repository
+
 final case class ExternalBinaryParams(
   binaryUrl: String,
   changing: Boolean,
   launcherPrefix: String,
   dependencies: Seq[dependency.Dependency],
   mainClass: String,
   forcedVersions: Seq[(dependency.Module, String)] = Nil,
-  extraRepos: Seq[String] = Nil
+  extraRepos: Seq[Repository] = Nil
 )
diff --git a/modules/options/src/main/scala/scala/build/internal/FetchExternalBinary.scala b/modules/options/src/main/scala/scala/build/internal/FetchExternalBinary.scala
@@ -37,12 +37,6 @@ object FetchExternalBinary {
       case Some(binary) =>
         ExternalBinary.Native(binary)
       case None =>
-        val extraRepositories0 = value {
-          RepositoryParser.repositories(params.extraRepos)
-            .either
-            .left.map(errors => new RepositoryFormatError(errors))
-        }
-
         val classPath = coursier.Fetch()
           .withCache(archiveCache.cache)
           .addDependencies(params.dependencies.map(_.toCs)*)
@@ -51,7 +45,7 @@ object FetchExternalBinary {
               params.forcedVersions.map { case (m, v) => m.toCs -> v }*
             )
           }
-          .addRepositories(extraRepositories0*)
+          .withRepositories(params.extraRepos)
           .run()(archiveCache.cache.ec)
           .map(os.Path(_, os.pwd))
         ExternalBinary.ClassPath(javaCommand(), classPath, params.mainClass)
diff --git a/modules/options/src/main/scala/scala/build/options/BuildOptions.scala b/modules/options/src/main/scala/scala/build/options/BuildOptions.scala
diff --git a/modules/options/src/main/scala/scala/build/options/ScalaVersionUtil.scala b/modules/options/src/main/scala/scala/build/options/ScalaVersionUtil.scala
