Merge pull request #2975 from bishabosha/version-overrides-launcherType

support mix of launcherType in version overrides

modules/install/src/main/scala/coursier/install/AppDescriptor.scala

@@ -76,6 +76,10 @@ import dataclass._
             versionOverride.prebuiltBinaries
               .getOrElse(prebuiltBinaries)
           }
+          .withLauncherType {
+            versionOverride.launcherType
+              .getOrElse(launcherType)
+          }
       }
       .getOrElse(this)
     val deps = overriddenDesc.dependencies

modules/install/src/main/scala/coursier/install/RawAppDescriptor.scala

@@ -289,7 +289,9 @@ object RawAppDescriptor {
     properties: Option[RawAppDescriptor.Properties] = None,
     @since("2.1.0-M4")
     prebuilt: Option[String] = None,
-    prebuiltBinaries: Option[Map[String, String]] = None
+    prebuiltBinaries: Option[Map[String, String]] = None,
+    @since("2.1.10")
+    launcherType: Option[String] = None
   ) {
     def versionOverride: ValidatedNel[String, VersionOverride] = {
       val versionRangeV = coursier.core.Parse
@@ -303,8 +305,13 @@ object RawAppDescriptor {
         case None                          => (None, None)
       }
 
-      (versionRangeV, repositoriesV, dependenciesV).mapN {
-        (versionRange, repositories, dependencies) =>
+      val launcherTypeV: ValidatedNel[String, Option[LauncherType]] =
+        launcherType.map(lt =>
+          Validated.fromEither(LauncherType.parse(lt).left.map(NonEmptyList.one))
+        ).sequence
+
+      (versionRangeV, repositoriesV, dependenciesV, launcherTypeV).mapN {
+        (versionRange, repositories, dependencies, launcherType) =>
           VersionOverride(versionRange)
             .withDependencies(dependencies)
             .withRepositories(repositories)
@@ -313,6 +320,7 @@ object RawAppDescriptor {
             .withJavaProperties(properties.map(_.props.sorted))
             .withPrebuiltLauncher(prebuilt)
             .withPrebuiltBinaries(prebuiltBinaries)
+            .withLauncherType(launcherType)
       }
     }
   }

modules/install/src/main/scala/coursier/install/VersionOverride.scala

@@ -13,5 +13,7 @@ import coursier.core.{Repository, VersionInterval}
   javaProperties: Option[Seq[(String, String)]] = None,
   @since("2.1.0-M4")
   prebuiltLauncher: Option[String] = None,
-  prebuiltBinaries: Option[Map[String, String]] = None
+  prebuiltBinaries: Option[Map[String, String]] = None,
+  @since("2.1.10")
+  launcherType: Option[LauncherType] = None
 )

modules/install/src/test/scala/coursier/install/InstallTests.scala

@@ -19,7 +19,7 @@ import utest._
 import scala.jdk.CollectionConverters._
 import scala.util.control.NonFatal
 import coursier.core.Version
-import scala.util.Properties
+import scala.util.{Properties, Using}
 
 object InstallTests extends TestSuite {
 
@@ -92,6 +92,11 @@ object InstallTests extends TestSuite {
       new String(FileUtil.readFully(zf.getInputStream(ent)), StandardCharsets.UTF_8)
     }
 
+  private def findInSource(f: File, needle: String, enc: String = "ISO_8859_1") =
+    Using(scala.io.Source.fromFile(f, enc)) { s =>
+      s.getLines().exists(line => line.contains(needle))
+    }.get
+
   private def commandOutput(command: String*): String =
     commandOutput(new File("."), mergeError = false, expectedReturnCode = 0, command: _*)
   private def commandOutput(
@@ -765,14 +770,18 @@ object InstallTests extends TestSuite {
         val id = "scalac"
         val versionOverride =
           RawAppDescriptor.RawVersionOverride("(,2.max]")
+            .withLauncherType(Some("bootstrap"))
             .withDependencies(Some(List("org.scala-lang:scala-compiler:2.12.8")))
             .withMainClass(Some("scala.tools.nsc.Main"))
+            .withProperties(Some(RawAppDescriptor.Properties(
+              Seq("scala.usejavacp" -> "true")
+            )))
         val appInfo0 = appInfo(
-          RawAppDescriptor(List("org.scala-lang:scala3-compiler_3:3.0.1"))
+          RawAppDescriptor(List("org.scala-lang:scala3-compiler_3:3.3.3"))
             .withRepositories(List("central"))
-            .withMainClass(Some("dotty.tools.dotc.Main"))
-            .withProperties(RawAppDescriptor.Properties(
-              Seq("scala.usejavacp" -> "true")
+            .withLauncherType("prebuilt")
+            .withPrebuilt(Some(
+              "zip+https://github.com/scala/scala3/releases/download/${version}/scala3-${version}.zip!scala3-${version}/bin/scalac"
             ))
             .withVersionOverrides(List(versionOverride)),
           id
@@ -787,6 +796,14 @@ object InstallTests extends TestSuite {
         val launcher = installDir0.actualDest(id)
         assert(Files.isRegularFile(launcher))
 
+        // for a prebuilt launcher, we expect the path of the launcher to appear somewhere in the script
+        val scala3path = {
+          val original =
+            "github.com/scala/scala3/releases/download/3.3.3/scala3-3.3.3.zip/scala3-3.3.3/bin/scala"
+          if (currentOs == "windows") original.replace('/', '\\')
+          else original
+        }
+
         def testRun(expectedUrls: Seq[String], expectedProperties: Seq[String]): Unit = {
           assert(Files.isRegularFile(launcher))
 
@@ -804,19 +821,28 @@ object InstallTests extends TestSuite {
           assert(properties == expectedProperties)
         }
 
-        val scala3CompilerJars =
-          Seq(
-            "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.0.1/scala3-compiler_3-3.0.1.jar",
-            "https://repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.0.1/scala3-library_3-3.0.1.jar",
-            "https://repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.6/scala-library-2.13.6.jar"
-          )
-        val scala3Properties =
-          Seq(
-            "bootstrap.mainClass=dotty.tools.dotc.Main",
-            "scala.usejavacp=true",
-            "scala3-compiler_3.version=3.0.1"
+        def searchInScript(needle: String): Unit = {
+          assert(Files.isRegularFile(launcher))
+
+          val foundNeedle = findInSource(launcher.toFile(), needle)
+          val expected    = true
+          assert(foundNeedle == expected)
+        }
+
+        def testOutput(expectedInOut: String): Unit = {
+          val output = commandOutput(
+            tmpDir.toFile,
+            mergeError = true,
+            expectedReturnCode = 0,
+            launcher.toAbsolutePath.toString,
+            "-version"
           )
-        testRun(scala3CompilerJars, scala3Properties)
+          assert(output.contains(expectedInOut))
+        }
+
+        searchInScript(scala3path)
+        if (currentOs == os)
+          testOutput("Scala compiler version 3.3.3 -- Copyright 2002-2024, LAMP/EPFL")
 
         val overridenAppInfo = appInfo0.overrideVersion("2.12.8")
         val overridden       = installDir0.createOrUpdate(overridenAppInfo)
@@ -835,12 +861,15 @@ object InstallTests extends TestSuite {
             "scala.usejavacp=true",
             "scala-compiler.version=2.12.8"
           )
+
         testRun(scala2CompilerJars, scala2Properties)
 
         val updated = installDir0.createOrUpdate(appInfo0)
         assert(updated.exists(identity))
 
-        testRun(scala3CompilerJars, scala3Properties)
+        searchInScript(scala3path)
+        if (currentOs == os)
+          testOutput("Scala compiler version 3.3.3 -- Copyright 2002-2024, LAMP/EPFL")
       }
 
       test("linux") - run("linux", "x86_64")