Do not use coursier cache

Switch scala-cli to use TempCache and create DirCache for our build

Move some classes from BytecodeProcessor to dedicated files

Author: romanowski

build.sc

@@ -584,14 +584,13 @@ trait Cli3 extends Cli {
   override def myScalaVersion = Scala.scala3
 
   override def nativeImageClassPath = T {
-    // TODO - results are cached - need to add inputs or caching method
-    val classpath     = super.nativeImageClassPath().map(_.path).mkString(File.pathSeparator)
-    val coursierCache = coursier.cache.FileCache[coursier.util.Task]().location.toString
+    val classpath = super.nativeImageClassPath().map(_.path).mkString(File.pathSeparator)
+    val cache     = T.dest / "native-cp"
     // `scala3-graal-processor`.run() do not give me output and I cannot pass dynamically computed values like classpath
     val res = mill.modules.Jvm.callSubprocess(
       mainClass = `scala3-graal-processor`.finalMainClass(),
       classPath = `scala3-graal-processor`.runClasspath().map(_.path),
-      mainArgs = Seq(coursierCache, classpath),
+      mainArgs = Seq(cache.toNIO.toString, classpath),
       workingDir = os.pwd
     )
     val cp = res.out.text

modules/cli/src/main/scala/scala/cli/packaging/NativeImage.scala

@@ -1,14 +1,12 @@
 package scala.cli.packaging
 
-import coursier.cache.FileCache
-
 import java.io.{File, OutputStream}
 
 import scala.annotation.tailrec
 import scala.build.internal.{NativeBuilderHelper, Runner}
 import scala.build.{Build, Logger}
 import scala.cli.errors.GraalVMNativeImageError
-import scala.cli.graal.{BytecodeProcessor, CoursierCache}
+import scala.cli.graal.{BytecodeProcessor, TempCache}
 import scala.util.Properties
 
 object NativeImage {
@@ -239,11 +237,9 @@ object NativeImage {
             if (!build.scalaParams.scalaBinaryVersion.startsWith("3"))
               (processedClassPath, Seq[os.Path](), Seq[String]())
             else {
-              val coursierCacheLocation = os.Path(FileCache().location.toPath())
-              val cache                 = CoursierCache(coursierCacheLocation)
-              val cpString              = processedClassPath.mkString(File.pathSeparator)
-              val processed             = BytecodeProcessor.processClassPath(cpString, cache).toSeq
-              val nativeConfigFile      = os.temp(suffix = ".json")
+              val cpString         = processedClassPath.mkString(File.pathSeparator)
+              val processed        = BytecodeProcessor.processClassPath(cpString, TempCache).toSeq
+              val nativeConfigFile = os.temp(suffix = ".json")
               os.write.over(
                 nativeConfigFile,
                 """[

modules/scala3-graal-processor/src/scala/cli/graal/CoursierCacheProcessor.scala

@@ -1,13 +1,14 @@
 package scala.cli.graal
 
 import java.io.File
+import java.nio.channels.FileChannel
 
 object CoursierCacheProcessor {
   def main(args: Array[String]) = {
-    val List(coursierCache, classpath) = args.toList
-    val cache                          = CoursierCache(BytecodeProcessor.toPath(coursierCache))
+    val List(cacheDir, classpath) = args.toList
+    val cache                     = DirCache(os.Path(cacheDir, os.pwd))
 
-    val newCp = BytecodeProcessor.processClasspath(classpath, cache).map(_.nioPath)
+    val newCp = BytecodeProcessor.processClassPath(classpath, cache).map(_.nioPath)
 
     println(newCp.mkString(File.pathSeparator))
   }

modules/scala3-graal/src/main/scala/scala/cli/graal/BytecodeProcessor.scala

@@ -3,46 +3,11 @@ package scala.cli.graal
 import org.objectweb.asm._
 
 import java.io.{File, InputStream}
-import java.nio.file.{Files, Path, StandardOpenOption}
+import java.nio.file.{Files, StandardOpenOption}
 import java.util.jar.{Attributes, JarEntry, JarFile, JarOutputStream, Manifest}
 
 import scala.jdk.CollectionConverters._
 
-trait JarCache {
-  def cache(path: os.Path)(processPath: os.Path => ClassPathEntry): ClassPathEntry
-  def put(entry: os.RelPath, bytes: Array[Byte]): ClassPathEntry
-}
-
-sealed trait ClassPathEntry {
-  def nioPath: Path = path.toNIO
-  def path: os.Path
-  def modified = true
-}
-case class Unmodified(path: os.Path) extends ClassPathEntry {
-  override def modified: Boolean = false
-}
-case class Processed(path: os.Path, original: os.Path, cache: JarCache) extends ClassPathEntry
-case class CreatedEntry(path: os.Path)                                  extends ClassPathEntry
-
-case class PathingJar(jar: ClassPathEntry, entries: Seq[ClassPathEntry]) extends ClassPathEntry {
-  override def path: os.Path = jar.path
-}
-
-object TempCache extends JarCache {
-  override def cache(path: os.Path)(processPath: os.Path => ClassPathEntry): ClassPathEntry =
-    processPath(
-      if (os.isDir(path)) os.temp.dir(prefix = path.last)
-      else os.temp(prefix = path.baseName, suffix = path.ext)
-    )
-
-  override def put(entry: os.RelPath, content: Array[Byte]): ClassPathEntry = {
-    val path = os.temp(prefix = entry.baseName, suffix = entry.ext)
-    os.write(path, content, createFolders = true)
-    CreatedEntry(path)
-  }
-
-}
-
 object BytecodeProcessor {
 
   def toClean(classpath: Seq[ClassPathEntry]): Seq[os.Path] = classpath.flatMap {

modules/scala3-graal/src/main/scala/scala/cli/graal/ClassPathEntry.scala

@@ -0,0 +1,19 @@
+package scala.cli.graal
+
+import java.nio.file.Path
+
+sealed trait ClassPathEntry {
+  def nioPath: Path = path.toNIO
+  def path: os.Path
+  def modified = true
+}
+
+case class Unmodified(path: os.Path) extends ClassPathEntry {
+  override def modified: Boolean = false
+}
+case class Processed(path: os.Path, original: os.Path, cache: JarCache) extends ClassPathEntry
+case class CreatedEntry(path: os.Path)                                  extends ClassPathEntry
+
+case class PathingJar(jar: ClassPathEntry, entries: Seq[ClassPathEntry]) extends ClassPathEntry {
+  override def path: os.Path = jar.path
+}

modules/scala3-graal/src/main/scala/scala/cli/graal/JarCache.scala

@@ -0,0 +1,35 @@
+package scala.cli.graal
+
+trait JarCache {
+  def cache(path: os.Path)(processPath: os.Path => ClassPathEntry): ClassPathEntry
+  def put(entry: os.RelPath, bytes: Array[Byte]): ClassPathEntry
+}
+
+case class DirCache(dir: os.Path) extends JarCache {
+  private def dest(original: os.Path) =
+    dir / s"${original.toNIO.toString.hashCode()}-${original.last}"
+  override def cache(path: os.Path)(processPath: os.Path => ClassPathEntry): ClassPathEntry =
+    processPath(dest(path))
+
+  override def put(entry: os.RelPath, content: Array[Byte]): ClassPathEntry = {
+    val path = dir / entry
+    os.write.over(path, content, createFolders = true)
+    CreatedEntry(path)
+  }
+}
+
+object TempCache extends JarCache {
+
+  override def cache(path: os.Path)(processPath: os.Path => ClassPathEntry): ClassPathEntry =
+    processPath(
+      if (os.isDir(path)) os.temp.dir(prefix = path.last)
+      else os.temp(prefix = path.baseName, suffix = "." + path.ext)
+    )
+
+  override def put(entry: os.RelPath, content: Array[Byte]): ClassPathEntry = {
+    val path = os.temp(prefix = entry.baseName, suffix = entry.ext)
+    os.write.over(path, content, createFolders = true)
+    CreatedEntry(path)
+  }
+
+}