Take into account JVM options defined in ~/.bloop/bloop.json

modules/bloop-rifle/src/main/scala/scala/build/blooprifle/BloopRifleConfig.scala

@@ -86,14 +86,14 @@ object BloopRifleConfig {
   }
 
   def default(
-    bloopClassPath: () => Either[Throwable, Seq[File]],
-    acceptBloopVersion: Option[String => Boolean]
+    bloopClassPath: () => Either[Throwable, Seq[File]]
   ): BloopRifleConfig =
     BloopRifleConfig(
       host = defaultHost,
       port = defaultPort,
       javaPath = "java",
-      javaOpts = defaultJavaOpts,
+      javaOpts =
+        defaultJavaOpts,
       classPath = bloopClassPath,
       bspSocketOrPort = None,
       bspStdin = None,
@@ -104,6 +104,6 @@ object BloopRifleConfig {
       startCheckPeriod = 100.millis,
       startCheckTimeout = 1.minute,
       initTimeout = 30.seconds,
-      acceptBloopVersion = acceptBloopVersion
+      acceptBloopVersion = None
     )
 }

modules/cli/src/main/scala/scala/cli/commands/SharedCompilationServerOptions.scala

@@ -1,9 +1,10 @@
 package scala.cli.commands
 
 import caseapp._
+import com.google.gson.Gson
 import coursier.core.Version
 
-import java.io.File
+import java.io.{BufferedReader, File, FileReader}
 import java.nio.file.{AtomicMoveNotSupportedException, FileAlreadyExistsException, Files}
 import java.util.Random
 
@@ -12,8 +13,7 @@ import scala.build.blooprifle.{BloopRifleConfig, BspConnectionAddress}
 import scala.build.{Bloop, Logger, Os}
 import scala.cli.internal.Pid
 import scala.concurrent.duration.{Duration, FiniteDuration}
-import scala.util.Properties
-
+import scala.util.Properties;
 
 // format: off
 final case class SharedCompilationServerOptions(
@@ -58,7 +58,10 @@ final case class SharedCompilationServerOptions(
   @Group("Compilation server")
     bloopDefaultJavaOpts: Boolean = true,
   @Group("Compilation server")
-    bloopJavaOpt: List[String] = Nil
+    bloopJavaOpt: List[String] = Nil,
+  @Group("Compilation server")
+  @HelpMessage("Bloop global options file")
+    bloopGlobalOptionsFile: String = (os.home / ".bloop" / "bloop.json").toNIO.toAbsolutePath().toString(),
 ) {
   // format: on
 
@@ -160,14 +163,38 @@ final case class SharedCompilationServerOptions(
   def minimumBloopVersion = Constants.bloopVersion
   def acceptBloopVersion  = Some((v: String) => Version(v) < Version(minimumBloopVersion))
 
+  case class BloopJson(javaHome: String, javaOptions: Array[String])
+
+  def bloopDefaultJvmOptions(logger: Logger): List[String] = {
+    val file = new File(bloopGlobalOptionsFile)
+    if (file.exists() && file.isFile()) {
+      try {
+        val reader = new BufferedReader(new FileReader(file))
+        val gson   = new Gson()
+        val json   = gson.fromJson(reader, classOf[BloopJson])
+        json.javaOptions.toList
+      }
+      catch {
+        case e: Throwable => {
+          e.printStackTrace()
+          List.empty
+        }
+      }
+    }
+    else {
+      logger.debug(s"Bloop global options file '${file.toPath().toAbsolutePath()}' not found.")
+      List.empty
+    }
+  }
+
   def bloopRifleConfig(
     logger: Logger,
     verbosity: Int,
     javaPath: String,
     directories: => scala.build.Directories
   ): BloopRifleConfig = {
     val baseConfig =
-      BloopRifleConfig.default(() => Bloop.bloopClassPath(logger), acceptBloopVersion)
+      BloopRifleConfig.default(() => Bloop.bloopClassPath(logger))
     val portOpt = bloopPort.filter(_ != 0) match {
       case Some(n) if n < 0 =>
         Some(scala.build.blooprifle.internal.Util.randomPort())
@@ -183,10 +210,12 @@ final case class SharedCompilationServerOptions(
       period = bloopBspCheckPeriodDuration.getOrElse(baseConfig.period),
       timeout = bloopBspTimeoutDuration.getOrElse(baseConfig.timeout),
       initTimeout = bloopStartupTimeoutDuration.getOrElse(baseConfig.initTimeout),
-      javaOpts = (if (bloopDefaultJavaOpts) baseConfig.javaOpts else Nil) ++ bloopJavaOpt
+      javaOpts =
+        (if (bloopDefaultJavaOpts) baseConfig.javaOpts
+         else Nil) ++ bloopJavaOpt ++ bloopDefaultJvmOptions(logger),
+      acceptBloopVersion = acceptBloopVersion
     )
   }
-
 }
 
 object SharedCompilationServerOptions {

modules/integration/src/test/scala/scala/cli/integration/BspTestDefinitions.scala

@@ -303,25 +303,24 @@ abstract class BspTestDefinitions(val scalaVersionOpt: Option[String])
     }
   }
 
+  def runScalaCli(args: String*) = os.proc(TestUtil.cli, args)
+
   def testScalaTermination(
     currentBloopVersion: String,
     expectedBloopVersionAfterScalaCliRun: String
-  ): Unit =
-    TestUtil.retry() {
-      def runBloop(args: String*) =
-        os.proc(TestUtil.cs, "launch", s"bloop-jvm:$currentBloopVersion", "--", args)
-
-      def runScalaCli(args: String*) = os.proc(TestUtil.cli, args)
-
-      runBloop("exit").call()
-      runBloop("about").call(stdout = os.Inherit, stderr = os.Inherit)
-      runScalaCli("bloop", "start", "-v", "-v", "-v").call(
-        stdout = os.Inherit,
-        stderr = os.Inherit
-      )
-      val versionLine = runBloop("about").call().out.lines()(0)
-      expect(versionLine == "bloop v" + expectedBloopVersionAfterScalaCliRun)
-    }
+  ) = {
+    def runBloop(args: String*) =
+      os.proc(TestUtil.cs, "launch", s"bloop-jvm:$currentBloopVersion", "--", args)
+
+    runBloop("exit").call()
+    runBloop("about").call(stdout = os.Inherit, stderr = os.Inherit)
+    runScalaCli("bloop", "start", "-v", "-v", "-v").call(
+      stdout = os.Inherit,
+      stderr = os.Inherit
+    )
+    val versionLine = runBloop("about").call().out.lines()(0)
+    expect(versionLine == "bloop v" + expectedBloopVersionAfterScalaCliRun)
+  }
 
   test("scala-cli terminates incompatible bloop") {
     testScalaTermination(Constants.oldBloopVersion, Constants.bloopVersion)
@@ -331,6 +330,40 @@ abstract class BspTestDefinitions(val scalaVersionOpt: Option[String])
     testScalaTermination(Constants.newBloopVersion, Constants.newBloopVersion)
   }
 
+  test("invalid bloop options passed via cli cause bloop start failure") {
+    runScalaCli("bloop", "exit").call()
+    val res = runScalaCli("bloop", "start", "--bloop-java-opt", "-Xmx1k").call(
+      stderr = os.Pipe,
+      check = false
+    )
+    expect(res.exitCode == 1)
+    expect(res.err.text().contains("Server didn't start"))
+  }
+
+  test("invalid bloop options passed via global bloop config json file cause bloop start failure") {
+    val inputs = TestInputs(
+      Seq(
+        os.rel / "bloop.json" ->
+          """|{
+             | "javaOptions" : ["-Xmx1k"]
+             | }""".stripMargin
+      )
+    )
+
+    inputs.fromRoot { root =>
+      runScalaCli("bloop", "exit").call()
+      val res = runScalaCli(
+        "bloop",
+        "start",
+        "--bloop-global-options-file",
+        (root / "bloop.json").toString()
+      )
+        .call(stderr = os.Pipe, check = false)
+      expect(res.exitCode == 1)
+      expect(res.err.text().contains("Server didn't start"))
+    }
+  }
+
   test("diagnostics") {
     val inputs = TestInputs(
       Seq(