Add meaningful 'minimum JVM version' to the bloop config

Author: MaciejG604

modules/cli/src/main/scala/scala/cli/commands/bloop/Bloop.scala

@@ -35,7 +35,7 @@ object Bloop extends ScalaCommand[BloopOptions] {
     )
     val options = sharedOptions.buildOptions(false, None).orExit(opts.global.logging.logger)
 
-    val javaCmd = opts.compilationServer.bloopJvm
+    val javaHomeInfo = opts.compilationServer.bloopJvm
       .map(JvmUtils.downloadJvm(_, options))
       .getOrElse {
         JvmUtils.getJavaCmdVersionOrHigher(17, options)
@@ -45,9 +45,9 @@ object Bloop extends ScalaCommand[BloopOptions] {
       opts.global.logging.logger,
       sharedOptions.coursierCache,
       opts.global.logging.verbosity,
-      javaCmd,
+      javaHomeInfo.javaCommand,
       Directories.directories,
-      Some(17)
+      Some(javaHomeInfo.version)
     )
   }
 

modules/cli/src/main/scala/scala/cli/commands/pgp/PgpExternalCommand.scala

@@ -138,7 +138,7 @@ object PgpExternalCommand {
         scalaCliSigningJvmVersion,
         jvmOptions,
         coursierOptions
-      ).orThrow
+      ).orThrow.javaCommand
 
     launcher(
       cache,
@@ -159,7 +159,7 @@ object PgpExternalCommand {
       JvmUtils.getJavaCmdVersionOrHigher(
         scalaCliSigningJvmVersion,
         buildOptions
-      ).orThrow
+      ).orThrow.javaCommand
 
     launcher(
       cache,

modules/cli/src/main/scala/scala/cli/commands/shared/SharedOptions.scala

@@ -26,7 +26,7 @@ import scala.build.internal.util.ConsoleUtils.ScalaCliConsole
 import scala.build.internal.util.WarningMessages
 import scala.build.internal.{Constants, FetchExternalBinary, ObjectCodeWrapper, OsLibc, Util}
 import scala.build.options.ScalaVersionUtil.fileWithTtl0
-import scala.build.options.{ComputeVersion, Platform, ScalacOpt, ShadowingSeq}
+import scala.build.options.{BuildOptions, ComputeVersion, Platform, ScalacOpt, ShadowingSeq}
 import scala.build.preprocessing.directives.ClasspathUtils.*
 import scala.build.preprocessing.directives.Toolkit
 import scala.build.options as bo
@@ -520,27 +520,28 @@ final case class SharedOptions(
 
   def bloopRifleConfig(): Either[BuildException, BloopRifleConfig] = either {
     val options = value(buildOptions(false, None))
-    lazy val defaultJvmCmd = value {
+    lazy val defaultJvmHome = value {
       JvmUtils.downloadJvm(OsLibc.defaultJvm(OsLibc.jvmIndexOs), options)
     }
 
-    val javaCmd = compilationServer.bloopJvm
+    val javaHomeInfo = compilationServer.bloopJvm
       .map(jvmId => value(JvmUtils.downloadJvm(jvmId, options)))
       .orElse {
         for (javaHome <- options.javaHomeLocationOpt()) yield {
           val (javaHomeVersion, javaHomeCmd) = OsLibc.javaHomeVersion(javaHome.value)
-          if (javaHomeVersion >= 17) javaHomeCmd
-          else defaultJvmCmd
+          if (javaHomeVersion >= 17)
+            BuildOptions.JavaHomeInfo(javaHome.value, javaHomeCmd, javaHomeVersion)
+          else defaultJvmHome
         }
-      }.getOrElse(defaultJvmCmd)
+      }.getOrElse(defaultJvmHome)
 
     compilationServer.bloopRifleConfig(
       logging.logger,
       coursierCache,
       logging.verbosity,
-      javaCmd,
+      javaHomeInfo.javaCommand,
       Directories.directories,
-      Some(17)
+      Some(javaHomeInfo.version)
     )
   }
 

modules/cli/src/main/scala/scala/cli/commands/util/JvmUtils.scala

@@ -7,6 +7,7 @@ import scala.build.EitherCps.{either, value}
 import scala.build.errors.{BuildException, JvmDownloadError, UnrecognizedDebugModeError}
 import scala.build.internal.CsLoggerUtil.*
 import scala.build.internal.OsLibc
+import scala.build.options.BuildOptions.JavaHomeInfo
 import scala.build.options.{JavaOpt, JavaOptions, ShadowingSeq}
 import scala.build.{Os, Position, Positioned, options as bo}
 import scala.cli.commands.shared.{CoursierOptions, SharedJvmOptions, SharedOptions}
@@ -67,38 +68,37 @@ object JvmUtils {
     )
   }
 
-  def downloadJvm(jvmId: String, options: bo.BuildOptions): Either[BuildException, String] = {
+  def downloadJvm(jvmId: String, options: bo.BuildOptions): Either[BuildException, JavaHomeInfo] = {
     implicit val ec: ExecutionContextExecutorService = options.finalCache.ec
     val javaHomeManager = options.javaHomeManager
       .withMessage(s"Downloading JVM $jvmId")
     val logger = javaHomeManager.cache
       .flatMap(_.archiveCache.cache.loggerOpt)
       .getOrElse(_root_.coursier.cache.CacheLogger.nop)
 
-    val javaHomePathOrError = Try(javaHomeManager.get(jvmId).unsafeRun()) match {
+    val javaHomeOrError = Try(javaHomeManager.get(jvmId).unsafeRun()) match {
       case Success(path) => Right(path)
       case Failure(e)    => Left(JvmDownloadError(jvmId, e))
     }
 
     for {
-      javaHomePath <- javaHomePathOrError
+      javaHome <- javaHomeOrError
     } yield {
-      val javaHome = os.Path(javaHomePath)
-      val ext      = if (Properties.isWin) ".exe" else ""
-      val javaCmd  = (javaHome / "bin" / s"java$ext").toString
-      javaCmd
+      val javaHomePath           = os.Path(javaHome)
+      val (javaVersion, javaCmd) = OsLibc.javaHomeVersion(javaHomePath)
+      JavaHomeInfo(javaHomePath, javaCmd, javaVersion)
     }
   }
 
   def getJavaCmdVersionOrHigher(
     javaVersion: Int,
     options: bo.BuildOptions
-  ): Either[BuildException, String] = {
+  ): Either[BuildException, JavaHomeInfo] = {
     val javaHomeCmdOpt = for {
       javaHome <- options.javaHomeLocationOpt()
       (javaHomeVersion, javaHomeCmd) = OsLibc.javaHomeVersion(javaHome.value)
       if javaHomeVersion >= javaVersion
-    } yield javaHomeCmd
+    } yield JavaHomeInfo(javaHome.value, javaHomeCmd, javaHomeVersion)
 
     javaHomeCmdOpt match {
       case Some(cmd) => Right(cmd)
@@ -110,7 +110,7 @@ object JvmUtils {
     javaVersion: Int,
     jvmOpts: SharedJvmOptions,
     coursierOpts: CoursierOptions
-  ): Either[BuildException, String] = {
+  ): Either[BuildException, JavaHomeInfo] = {
     val sharedOpts = SharedOptions(jvm = jvmOpts, coursier = coursierOpts)
 
     for {