Repackage the Scala 2.13 stdlib with .tasty files

Author: nicolasstucki

.github/workflows/ci.yaml

@@ -134,7 +134,7 @@ jobs:
 
       - name: Cmd Tests
         run: |
-          ./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped/test:run ;stdlib-2_13-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
+          ./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped/test:run ;stdlib-2_13-bootstrapped/test:run ;stdlib-2_13-tasty-bundle/packageBin ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
           ./project/scripts/cmdTests
           ./project/scripts/bootstrappedOnlyCmdTests
 
@@ -488,7 +488,7 @@ jobs:
 
       - name: Test
         run: |
-          ./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped/test:run ;stdlib-2_13-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test"
+          ./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped/test:run ;stdlib-2_13-bootstrapped/test:run ;stdlib-2_13-tasty-bundle/packageBin ;stdlib-bootstrapped-tasty-tests/test"
           ./project/scripts/cmdTests
           ./project/scripts/bootstrappedOnlyCmdTests
 

build.sbt

@@ -16,6 +16,7 @@ val `scala3-bench-bootstrapped` = Build.`scala3-bench-bootstrapped`
 val `scala3-bench-micro` = Build.`scala3-bench-micro`
 val `stdlib-bootstrapped` = Build.`stdlib-bootstrapped`
 val `stdlib-2_13-bootstrapped` = Build.`stdlib-2_13-bootstrapped`
+val `stdlib-2_13-tasty-bundle` = Build.`stdlib-2_13-tasty-bundle`
 val `stdlib-bootstrapped-tasty-tests` = Build.`stdlib-bootstrapped-tasty-tests`
 val `tasty-core` = Build.`tasty-core`
 val `tasty-core-bootstrapped` = Build.`tasty-core-bootstrapped`

project/Build.scala

@@ -1044,6 +1044,66 @@ object Build {
       },
   )
 
+  /** Creates a copy of the Scala 2.13 library JAR with TASTy from `stdlib-2_13-bootstrapped` */
+  lazy val `stdlib-2_13-tasty-bundle` = project.in(file("stdlib-2_13-tasty-bundle")).
+    withCommonSettings(Bootstrapped).
+    dependsOn(`stdlib-2_13-bootstrapped`).
+    settings(commonBootstrappedSettings).
+    settings(
+      moduleName := "scala-library",
+      exportJars := true,
+      Compile / compile := {
+        val classDir = (Compile / classDirectory).value
+
+        // Copy contents of Scala 2.13 JAR into classDir
+        val s = streams.value
+        val report = updateClassifiers.value
+        val scalaLibraryJar =
+          // FIXME could not find it with report.select. Other options?
+          report.select(
+              configuration = configurationFilter("compile"),
+              module = (_: ModuleID).name == "scala-library",
+              artifact = artifactFilter(`type` = "src"))
+              .headOption.getOrElse {
+            sys.error(s"Could not fetch scala-library sources")
+          }.getParentFile / s"scala-library-${stdlibVersion(Bootstrapped)}.jar"
+        val cacheDir = s.cacheDirectory
+        FileFunction.cached(cacheDir / "fetchScalaLibraryBin",
+            FilesInfo.lastModified, FilesInfo.exists) { dependencies =>
+          s.log.info(s"Unpacking scala-library classfiles to $classDir")
+          if (classDir.exists)
+            IO.delete(classDir)
+          IO.createDirectory(classDir)
+          IO.unzip(scalaLibraryJar, classDir)
+          (classDir ** "*").get.toSet
+        } (Set(scalaLibraryJar)).toSeq
+        IO.delete(classDir / "META-INF")
+        // TODO What to do with library.properties, LICENSE, NOTICE, rootdoc.txt? Keep? Modify?
+
+        // Copy .tasty files from stdlib-2_13-bootstrapped into classDir
+        val tastySrcDir = (`stdlib-2_13-bootstrapped` / Compile / classDirectory).value
+        s.log.info(s"Copying .tasty files from $tastySrcDir to $classDir")
+        for (tastyFile <- tastySrcDir.allPaths.get()) {
+          if (tastyFile.getName.endsWith(".tasty")) {
+            val tastyFileDest = tastyFile.relativeTo(tastySrcDir).get
+            val destFile = classDir / tastyFileDest.toString()
+            IO.copyFile(tastyFile, destFile)
+          }
+        }
+
+        (Compile / compile).value
+      },
+      Compile / packageBin / artifactName := { (sv: ScalaVersion, module: ModuleID, artifact: Artifact) =>
+        artifact.name + "-" + stdlibVersion(Bootstrapped) + "-" + module.revision + "." + artifact.extension
+      },
+      Compile / packageBin :=  {
+        val version = stdlibVersion(Bootstrapped)
+        val path = (Compile / packageBin / artifactPath).value
+        streams.value.log.info(s"Repackaging Scala $version library with .tasty files into $path")
+        (Compile / packageBin).value
+      }
+    )
+
   /** Test the tasty generated by `stdlib-bootstrapped`
    *
    *  The tests are run with the bootstrapped compiler and the tasty inpector on the classpath.

stdlib-2_13-tasty-bundle/README.md

@@ -0,0 +1,5 @@
+Creates a copy of the Scala 2.13 library JAR with TASTy from `stdlib-2_13-bootstrapped`.
+
+```
+sbt> stdlib-2_13-tasty-bundle/packageBin
+```

stdlib-2_13-tasty-bundle/test/Main.scala

@@ -0,0 +1,12 @@
+package hello
+
+enum Color:
+  case Red, Green, Blue
+
+object HelloWorld:
+  def main(args: Array[String]): Unit = {
+    println("hello 2.13 library bootstrapped")
+    println(Color.Red)
+    println(Color.Green)
+    println(Color.Blue)
+  }