Merge pull request #2263 from lwronski/build-changes

Build changes

Author: lwronski

.github/workflows/ci.yml

@@ -27,6 +27,9 @@ jobs:
     - name: Copy launcher
       run: ./mill -i copyJvmLauncher artifacts/
       if: runner.os == 'Linux'
+    - name: Copy bootstrapped launcher
+      run: ./mill -i copyJvmBootstrappedLauncher artifacts/
+      if: runner.os == 'Linux'
     - uses: actions/upload-artifact@v3
       if: runner.os == 'Linux'
       with:

build.sc

@@ -196,7 +196,7 @@ object dummy extends Module {
   // dummy projects to get scala steward updates for Ammonite and scalafmt, whose
   // versions are used in the fmt and repl commands, and ensure Ammonite is available
   // for all Scala versions we support.
-  object amm extends Cross[Amm](Scala.listAllAmmonite: _*)
+  object amm extends Cross[Amm](Scala.listMaxAmmoniteScalaVersion: _*)
   class Amm(val crossScalaVersion: String) extends CrossScalaModule with Bloop.Module {
     def skipBloop = true
     def ivyDeps = Agg(
@@ -1248,6 +1248,15 @@ def copyJvmLauncher(directory: String = "artifacts") = T.command {
     replaceExisting = true
   )
 }
+def copyJvmBootstrappedLauncher(directory: String = "artifacts") = T.command {
+  val launcher = cliBootstrapped.jar().path
+  os.copy(
+    launcher,
+    os.Path(directory, os.pwd) / s"scala-cli.jar",
+    createFolders = true,
+    replaceExisting = true
+  )
+}
 
 def uploadLaunchers(directory: String = "artifacts") = T.command {
   val version = cli.publishVersion()

project/deps.sc

@@ -34,6 +34,8 @@ object Scala {
   def maxAmmoniteScala212Version = scala212
   def maxAmmoniteScala213Version = scala213
   def maxAmmoniteScala3Version   = "3.2.2"
+  lazy val listMaxAmmoniteScalaVersion =
+    Seq(maxAmmoniteScala212Version, maxAmmoniteScala213Version, maxAmmoniteScala3Version)
   lazy val listAllAmmonite = {
     import coursier.core.Version
     val max212 = Version(maxAmmoniteScala212Version)