Use JVM-based substitutes when external binaries are not available

Author: alexarchambault

build.sc

@@ -355,6 +355,8 @@ trait Core extends ScalaCliSbtModule with ScalaCliPublishModule with HasTests
          |  def millVersion = "${InternalDeps.Versions.mill}"
          |  def lefouMillwRef = "${InternalDeps.Versions.lefouMillwRef}"
          |
+         |  def scalafmtOrganization = "${Deps.scalafmtCli.dep.module.organization.value}"
+         |  def scalafmtName = "${Deps.scalafmtCli.dep.module.name.value}"
          |  def defaultScalafmtVersion = "${Deps.scalafmtCli.dep.version}"
          |
          |  def defaultScalaVersion = "${Scala.defaultUser}"
@@ -366,7 +368,11 @@ trait Core extends ScalaCliSbtModule with ScalaCliPublishModule with HasTests
          |  def defaultGraalVMJavaVersion = ${deps.graalVmJavaVersion}
          |  def defaultGraalVMVersion = "${deps.graalVmVersion}"
          |
+         |  def scalaCliSigningOrganization = "${Deps.signingCli.dep.module.organization.value}"
+         |  def scalaCliSigningName = "${Deps.signingCli.dep.module.name.value}"
          |  def scalaCliSigningVersion = "${Deps.signingCli.dep.version}"
+         |  def javaClassNameOrganization = "${Deps.javaClassName.dep.module.organization.value}"
+         |  def javaClassNameName = "${Deps.javaClassName.dep.module.name.value}"
          |  def javaClassNameVersion = "${Deps.javaClassName.dep.version}"
          |
          |  def libsodiumVersion = "${deps.libsodiumVersion}"

modules/build/src/main/java/scala/build/internal/JavaParserProxyMakerSubst.java

@@ -3,6 +3,8 @@
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 
+import java.util.function.Supplier;
+
 /**
  * This makes [[JavaParserProxyMaker.get]] provide a [[JavaParserProxyBinary]]
  * rather than a [[JavaParserProxyJvm]], from native launchers.
@@ -15,8 +17,9 @@ public final class JavaParserProxyMakerSubst {
   public JavaParserProxy get(
     Object archiveCache,
     scala.Option<String> javaClassNameVersionOpt,
-    scala.build.Logger logger
+    scala.build.Logger logger,
+    Supplier<String> javaCommand
   ) {
-    return new JavaParserProxyBinary(archiveCache, logger, javaClassNameVersionOpt);
+    return new JavaParserProxyBinary(archiveCache, logger, javaClassNameVersionOpt, javaCommand);
   }
 }

modules/build/src/main/scala/scala/build/Build.scala

@@ -219,7 +219,8 @@ object Build {
         Sources.defaultPreprocessors(
           options.scriptOptions.codeWrapper.getOrElse(CustomCodeWrapper),
           options.archiveCache,
-          options.internal.javaClassNameVersionOpt
+          options.internal.javaClassNameVersionOpt,
+          () => options.javaHome().value.javaCommand
         ),
         logger
       )

modules/build/src/main/scala/scala/build/Sources.scala

@@ -87,11 +87,12 @@ object Sources {
   def defaultPreprocessors(
     codeWrapper: CodeWrapper,
     archiveCache: ArchiveCache[Task],
-    javaClassNameVersionOpt: Option[String]
+    javaClassNameVersionOpt: Option[String],
+    javaCommand: () => String
   ): Seq[Preprocessor] =
     Seq(
       ScriptPreprocessor(codeWrapper),
-      JavaPreprocessor(archiveCache, javaClassNameVersionOpt),
+      JavaPreprocessor(archiveCache, javaClassNameVersionOpt, javaCommand),
       ScalaPreprocessor,
       DataPreprocessor
     )

modules/build/src/main/scala/scala/build/bsp/BspImpl.scala

@@ -95,7 +95,8 @@ final class BspImpl(
         Sources.defaultPreprocessors(
           buildOptions.scriptOptions.codeWrapper.getOrElse(CustomCodeWrapper),
           buildOptions.archiveCache,
-          buildOptions.internal.javaClassNameVersionOpt
+          buildOptions.internal.javaClassNameVersionOpt,
+          () => buildOptions.javaHome().value.javaCommand
         ),
         persistentLogger,
         maybeRecoverOnError(Scope.Main)

modules/build/src/main/scala/scala/build/internal/JavaParserProxyBinary.scala

@@ -2,6 +2,9 @@ package scala.build.internal
 
 import coursier.cache.ArchiveCache
 import coursier.util.Task
+import dependency._
+
+import java.util.function.Supplier
 
 import scala.build.EitherCps.{either, value}
 import scala.build.Logger
@@ -12,7 +15,8 @@ import scala.util.Properties
 class JavaParserProxyBinary(
   archiveCache: ArchiveCache[Task],
   javaClassNameVersionOpt: Option[String],
-  logger: Logger
+  logger: Logger,
+  javaCommand: () => String
 ) extends JavaParserProxy {
 
   /** For internal use only
@@ -23,9 +27,15 @@ class JavaParserProxyBinary(
   def this(
     archiveCache: Object,
     logger: Logger,
-    javaClassNameVersionOpt: Option[String]
+    javaClassNameVersionOpt: Option[String],
+    javaCommand0: Supplier[String]
   ) =
-    this(archiveCache.asInstanceOf[ArchiveCache[Task]], javaClassNameVersionOpt, logger)
+    this(
+      archiveCache.asInstanceOf[ArchiveCache[Task]],
+      javaClassNameVersionOpt,
+      logger,
+      () => javaCommand0.get()
+    )
 
   def className(content: Array[Byte]): Either[BuildException, Option[String]] = either {
 
@@ -38,19 +48,28 @@ class JavaParserProxyBinary(
     val url =
       s"https://github.com/scala-cli/java-class-name/releases/download/$tag/java-class-name-$platformSuffix$ext"
 
+    val params = ExternalBinaryParams(
+      url,
+      changing,
+      "java-class-name",
+      Seq(
+        dep"${Constants.javaClassNameOrganization}:${Constants.javaClassNameName}:${Constants.javaClassNameVersion}"
+      ),
+      "scala.cli.javaclassname.JavaClassName" // FIXME I'd rather not hardcode that, but automatic detection is cumbersome to setup…
+    )
     val binary =
-      value(FetchExternalBinary.fetch(url, changing, archiveCache, logger, "java-class-name"))
+      value(FetchExternalBinary.fetch(params, archiveCache, logger, javaCommand))
 
     val source =
       os.temp(content, suffix = ".java", perms = if (Properties.isWin) null else "rw-------")
+    val command = binary.command
     val output =
       try {
-        logger.debug(s"Running $binary $source")
-        val res = os.proc(binary, source).call()
+        logger.debug(s"Running $command $source")
+        val res = os.proc(command, source).call()
         res.out.text().trim
       }
       finally os.remove(source)
-
     if (output.isEmpty) None
     else Some(output)
   }

modules/build/src/main/scala/scala/build/internal/JavaParserProxyMaker.scala

@@ -1,5 +1,7 @@
 package scala.build.internal
 
+import java.util.function.Supplier
+
 import scala.build.Logger
 
 /** On the JVM, provides [[JavaParserProxyJvm]] as [[JavaParserProxy]] instance.
@@ -18,7 +20,8 @@ class JavaParserProxyMaker {
   def get(
     archiveCache: Object, // Actually a ArchiveCache[Task], but having issues with the higher-kind type param from Java…
     javaClassNameVersionOpt: Option[String],
-    logger: Logger
+    logger: Logger,
+    javaCommand: Supplier[String]
   ): JavaParserProxy =
     new JavaParserProxyJvm
 }

modules/build/src/main/scala/scala/build/preprocessing/JavaPreprocessor.scala

@@ -28,7 +28,8 @@ import scala.build.{Inputs, Logger}
   */
 final case class JavaPreprocessor(
   archiveCache: ArchiveCache[Task],
-  javaClassNameVersionOpt: Option[String]
+  javaClassNameVersionOpt: Option[String],
+  javaCommand: () => String
 ) extends Preprocessor {
   def preprocess(
     input: Inputs.SingleElement,
@@ -72,7 +73,8 @@ final case class JavaPreprocessor(
                   .get(
                     archiveCache,
                     javaClassNameVersionOpt,
-                    logger
+                    logger,
+                    () => javaCommand()
                   )
                   .className(v.content)
               }

modules/build/src/test/scala/scala/build/tests/SourcesTests.scala

@@ -29,7 +29,8 @@ class SourcesTests extends munit.FunSuite {
         def ec                       = sys.error("shouldn't be used")
       }
     ),
-    None
+    None,
+    () => sys.error("shouldn't be used")
   )
 
   test("dependencies in .scala - $ivy") {

modules/cli-options/src/main/scala/scala/cli/commands/config/ConfigOptions.scala

@@ -2,7 +2,12 @@ package scala.cli.commands.config
 
 import caseapp._
 
-import scala.cli.commands.{CoursierOptions, LoggingOptions, SharedDirectoriesOptions}
+import scala.cli.commands.{
+  CoursierOptions,
+  LoggingOptions,
+  SharedDirectoriesOptions,
+  SharedJvmOptions
+}
 
 // format: off
 final case class ConfigOptions(
@@ -12,6 +17,8 @@ final case class ConfigOptions(
     directories: SharedDirectoriesOptions = SharedDirectoriesOptions(),
   @Recurse
     coursier: CoursierOptions = CoursierOptions(),
+  @Recurse
+    jvm: SharedJvmOptions = SharedJvmOptions(),
 
   @Group("Config")
   @HelpMessage("Dump config DB as JSON")