download and cache launcher, add scalajs library

Author: bishabosha

dist/bin/cli-common

@@ -151,7 +151,7 @@ find_lib () {
   done
 }
 
-SCALA_CLI_JAR=$(find_lib "*scala-cli*")
+SCALA_CLI_JAR="$PROG_HOME/etc/scala-cli.jar"
 
 declare -a scala_args
 

dist/bin/scala

@@ -44,7 +44,7 @@ if [ -z "$SCALA_VERSION" ]; then
   exit 1
 fi
 
-MVN_REPOSITORY="file://$PROG_HOME/local/maven2"
+MVN_REPOSITORY="file://$PROG_HOME/maven2"
 
 # escape all script arguments
 while [[ $# -gt 0 ]]; do

project/Build.scala

@@ -118,6 +118,9 @@ object Build {
    */
   val mimaPreviousLTSDottyVersion = "3.3.0"
 
+  /** Version of Scala CLI to download */
+  val scalaCliLauncherVersion = "1.3.0"
+
   object CompatMode {
     final val BinaryCompatible = 0
     final val SourceAndBinaryCompatible = 1
@@ -2108,17 +2111,21 @@ object Build {
     publishArtifact := false,
     packGenerateMakefile := false,
     packArchiveName := "scala3-" + dottyVersion,
-    republishRepo := target.value / "local-repo",
-    Compile / pack := {
-      val localRepo = republishClasspath.value // republish all artifacts to local repo
-      (Compile / pack).value
-    }
+    republishRepo := target.value / "republish",
+    republishLaunchers := {
+      val cliV = scalaCliLauncherVersion
+      Seq(
+        ("scala-cli.jar", cliV, url(s"https://github.com/VirtusLab/scala-cli/releases/download/v$cliV/scala-cli.jar"))
+      )
+    },
+    Compile / pack := (Compile / pack).dependsOn(republish).value,
   )
 
   lazy val dist = project.asDist(Bootstrapped)
     .settings(
       packResourceDir += (baseDirectory.value / "bin" -> "bin"),
-      packResourceDir += (target.value / "local-repo" -> "local"),
+      packResourceDir += (republishRepo.value / "maven2" -> "maven2"),
+      packResourceDir += (republishRepo.value / "etc" -> "etc"),
     )
 
   private def customMimaReportBinaryIssues(issueFilterLocation: String) = mimaReportBinaryIssues := {
@@ -2249,6 +2256,7 @@ object Build {
     def asDist(implicit mode: Mode): Project = project.
       enablePlugins(PackPlugin).
       enablePlugins(RepublishPlugin).
+      bootstrappedEnablePlugins(DottyJSPlugin).
       withCommonSettings.
       settings(commonDistSettings).
       dependsOn(
@@ -2261,6 +2269,9 @@ object Build {
         scaladoc,
         `scala3-sbt-bridge`, // for scala-cli
       ).
+      bootstrappedDependsOn(
+        `scala3-library-bootstrappedJS` // for scala-cli
+      ).
       bootstrappedSettings(
         target := baseDirectory.value / "target" // override setting in commonBootstrappedSettings
       )

project/Modes.scala

@@ -1,4 +1,4 @@
-import sbt.{Project, ProjectReference, SettingsDefinition}
+import sbt.{Project, ProjectReference, SettingsDefinition, Plugins}
 
 object Modes {
 
@@ -25,5 +25,9 @@ object Modes {
     def bootstrappedDependsOn(s: sbt.ClasspathDep[ProjectReference]*)(implicit mode: Mode): Project =
       if (mode == NonBootstrapped) project else project.dependsOn(s: _*)
 
+    /** Plugins only if the mode is bootstrapped */
+    def bootstrappedEnablePlugins(ns: Plugins*)(implicit mode: Mode): Project =
+      if (mode == NonBootstrapped) project else project.enablePlugins(ns: _*)
+
   }
 }

project/RepublishPlugin.scala

@@ -6,6 +6,8 @@ import sbt.Keys._
 import sbt.AutoPlugin
 import sbt.PublishBinPlugin
 import sbt.PublishBinPlugin.autoImport._
+import sbt.io.Using
+import sbt.util.CacheImplicits._
 
 import scala.collection.mutable
 import java.nio.file.Files
@@ -20,8 +22,11 @@ object RepublishPlugin extends AutoPlugin {
     val republishProjectRefs = taskKey[Seq[ProjectRef]]("fetch the classpath deps from the project.")
     val republishLocalResolved = taskKey[Seq[ResolvedArtifacts]]("resolve local artifacts for distribution.")
     val republishAllResolved = taskKey[Seq[ResolvedArtifacts]]("Resolve the dependencies for the distribution")
-    val republishClasspath = taskKey[File]("cache the dependencies for the distribution")
+    val republishClasspath = taskKey[Set[File]]("cache the dependencies for the distribution")
+    val republishFetchLaunchers = taskKey[Set[File]]("cache the launcher deps for the distribution")
+    val republish = taskKey[File]("cache the dependencies and download launchers for the distribution")
     val republishRepo = settingKey[File]("the location to store the republished artifacts.")
+    val republishLaunchers = settingKey[Seq[(String, String, URL)]]("launchers to download. Sequence of (name, version, URL).")
   }
 
   import autoImport._
@@ -43,17 +48,17 @@ object RepublishPlugin extends AutoPlugin {
       val publishAllLocalBin = deps.map({ d => ((d / publishLocalBin / packagedArtifacts)) }).join
       val resolveId = deps.map({ d => ((d / projectID)) }).join
       Def.task {
-        val s = streams.value
-        val log = s.log
         val published = publishAllLocalBin.value
         val ids = resolveId.value
 
         ids.zip(published).map({ case (id, as) =>
           val simpleId = {
+            val disabled = CrossVersion.disabled
             val name0 = id.crossVersion match {
-              case _: CrossVersion.Binary =>
+              case cv: CrossVersion.Binary =>
                 // projectID does not add binary suffix
-                (id.name + "_3").ensuring(!id.name.endsWith("_3") && id.revision.startsWith("3."))
+                (s"${id.name}_${cv.prefix}${cv.suffix}3")
+                  .ensuring(!id.name.endsWith("_3") && id.revision.startsWith("3."))
               case _ => id.name
             }
             SimpleModuleId(id.organization, name0, id.revision)
@@ -117,11 +122,15 @@ object RepublishPlugin extends AutoPlugin {
       found.values.toSeq
     },
     republishClasspath := {
+      val s = streams.value
       val resolved = republishAllResolved.value
       val cacheDir = republishRepo.value
+
+      val log = s.log
       val mavenRepo = cacheDir / "maven2"
       IO.createDirectory(mavenRepo)
-      resolved.foreach { ra =>
+      resolved.map { ra =>
+        log.info(s"[republish] publishing ${ra.id} to $mavenRepo...")
         val jar = ra.jar
         val pom = ra.pom
 
@@ -130,7 +139,54 @@ object RepublishPlugin extends AutoPlugin {
         IO.createDirectory(artifactDir)
         IO.copyFile(jar, artifactDir / jar.getName)
         IO.copyFile(pom, artifactDir / pom.getName)
+        artifactDir
+      }.toSet
+    },
+    republishFetchLaunchers := {
+      val s = streams.value
+      val log = s.log
+      val repoDir = republishRepo.value
+      val launcherVersions = republishLaunchers.value
+
+      val etc = repoDir / "etc"
+
+      val store = s.cacheStoreFactory / "versions"
+
+      def work(dest: File, launcher: URL) = {
+        IO.delete(dest)
+        Using.urlInputStream(launcher) { in =>
+          IO.createDirectory(etc)
+          log.info(s"[republish] Downloading $launcher to $dest...")
+          IO.transfer(in, dest)
+          log.info(s"[republish] Downloaded $launcher to $dest...")
+        }
+        dest
+      }
+
+      val allLaunchers = {
+        for ((name, version, launcher) <- launcherVersions) yield {
+          val dest = etc / name
+
+          val id = name.replaceAll("[^a-zA-Z0-9]", "_")
+
+          val fetchAction = Tracked.inputChanged[String, File](store.make(id)) { (inChanged, version) =>
+            if (inChanged || !Files.exists(dest.toPath)) {
+              work(dest, launcher)
+            } else {
+              log.info(s"[republish] Using cached $launcher at $dest...")
+              dest
+            }
+          }
+
+          fetchAction(version)
+        }
       }
+      allLaunchers.toSet
+    },
+    republish := {
+      val cacheDir = republishRepo.value
+      val artifacts = republishClasspath.value
+      val launchers = republishFetchLaunchers.value
       cacheDir
     }
   )