Add a launcher option to add predefined repositories

Author: Gedochao

modules/cli/src/main/scala/scala/cli/ScalaCli.scala

@@ -16,6 +16,7 @@ import scala.cli.javaLauncher.JavaLauncherCli
 import scala.cli.launcher.{LauncherCli, LauncherOptions, PowerOptions}
 import scala.cli.publish.BouncycastleSignerMaker
 import scala.cli.util.ConfigDbUtils
+import scala.collection.mutable.ListBuffer
 import scala.util.Properties
 
 object ScalaCli {
@@ -53,7 +54,8 @@ object ScalaCli {
   private def isGraalvmNativeImage: Boolean =
     sys.props.contains("org.graalvm.nativeimage.imagecode")
 
-  private var defaultScalaVersion: Option[String] = None
+  private var defaultScalaVersion: Option[String]        = None
+  val launcherPredefinedRepositories: ListBuffer[String] = ListBuffer.empty
 
   def getDefaultScalaVersion: String = defaultScalaVersion.getOrElse(Constants.defaultScalaVersion)
 
@@ -243,6 +245,8 @@ object ScalaCli {
           case None =>
             if launcherOpts.cliUserScalaVersion.nonEmpty then
               defaultScalaVersion = launcherOpts.cliUserScalaVersion
+            if launcherOpts.cliPredefinedRepository.nonEmpty then
+              launcherPredefinedRepositories.addAll(launcherOpts.cliPredefinedRepository)
             if launcherOpts.powerOptions.power then
               isSipScala = false
               args0.toArray

modules/cli/src/main/scala/scala/cli/commands/shared/SharedOptions.scala

@@ -394,7 +394,10 @@ final case class SharedOptions(
         extraClassPath = extraRegularJarsAndClasspath,
         extraCompileOnlyJars = extraCompileOnlyClassPath,
         extraSourceJars = extraSourceJars.extractedClassPath ++ assumedSourceJars,
-        extraRepositories = dependencies.repository.map(_.trim).filter(_.nonEmpty),
+        extraRepositories =
+          (dependencies.repository ++ ScalaCli.launcherPredefinedRepositories).map(_.trim).filter(
+            _.nonEmpty
+          ),
         extraDependencies = ShadowingSeq.from(
           SharedOptions.parseDependencies(
             dependencies.dependency.map(Positioned.none),

modules/cli/src/main/scala/scala/cli/launcher/LauncherOptions.scala

@@ -28,6 +28,15 @@ final case class LauncherOptions(
   @Tag(tags.implementation)
   @Name("cliDefaultScalaVersion")
   cliUserScalaVersion: Option[String] = None,
+  @Group(HelpGroup.Launcher.toString)
+  @HelpMessage("")
+  @Hidden
+  @Tag(tags.implementation)
+  @Name("r")
+  @Name("repo")
+  @Name("repository")
+  @Name("predefinedRepository")
+  cliPredefinedRepository: List[String] = Nil,
   @Recurse
   powerOptions: PowerOptions = PowerOptions()
 )

modules/integration/src/test/scala/scala/cli/integration/SipScalaTests.scala

@@ -593,4 +593,46 @@ class SipScalaTests extends ScalaCliSuite {
       expect(r.err.trim().contains("already specified"))
     }
   }
+
+  for {
+    withBloop <- Seq(true, false)
+    withBloopString = if (withBloop) "with Bloop" else "with --server=false"
+  }
+    test(
+      s"default Scala version coming straight from a predefined local repository $withBloopString"
+    ) {
+      TestInputs(
+        os.rel / "simple.sc" -> "println(dotty.tools.dotc.config.Properties.simpleVersionString)"
+      )
+        .fromRoot { root =>
+          val localRepoPath = root / "local-repo"
+          val sv            = "3.4.1-RC1"
+          val csRes = os.proc(
+            TestUtil.cs,
+            "fetch",
+            "--cache",
+            localRepoPath,
+            s"org.scala-lang:scala3-compiler_3:$sv"
+          )
+            .call(cwd = root)
+          expect(csRes.exitCode == 0)
+          val buildServerOptions =
+            if (withBloop) Nil else Seq("--server=false")
+          val r = os.proc(
+            TestUtil.cli,
+            "--cli-default-scala-version",
+            sv,
+            "--predefined-repository",
+            (localRepoPath / "https" / "repo1.maven.org" / "maven2").toNIO.toUri.toASCIIString,
+            "run",
+            "simple.sc",
+            "--with-compiler",
+            "--offline",
+            "--power",
+            buildServerOptions
+          )
+            .call(cwd = root)
+          expect(r.out.trim() == sv)
+        }
+    }
 }