Merge pull request #347 from lwronski/fix-parsing-bloop-config

Fix parsing bloop config - ignore error during parsing

Author: lwronski

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

@@ -1,3 +1,9 @@
 package scala.cli.commands
 
-case class BloopJson(javaHome: String, javaOptions: Array[String])
+import upickle.default.{ReadWriter, macroRW}
+
+case class BloopJson(javaOptions: List[String] = Nil)
+
+case object BloopJson {
+  implicit lazy val jsonCodec: ReadWriter[BloopJson] = macroRW
+}

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

@@ -1,10 +1,10 @@
 package scala.cli.commands
 
 import caseapp._
-import com.google.gson.Gson
 import upickle.default.{ReadWriter, macroRW}
 
-import java.io.{BufferedReader, File, FileReader}
+import java.io.File
+import java.nio.charset.Charset
 import java.nio.file.{AtomicMoveNotSupportedException, FileAlreadyExistsException, Files}
 import java.util.{Locale, Random}
 
@@ -13,6 +13,7 @@ import scala.build.blooprifle.{BloopRifleConfig, BloopVersion, BspConnectionAddr
 import scala.build.{Bloop, Logger, Os}
 import scala.cli.internal.Pid
 import scala.concurrent.duration.{Duration, FiniteDuration}
+import scala.io.Codec
 import scala.util.Properties
 
 // format: off
@@ -190,21 +191,23 @@ final case class SharedCompilationServerOptions(
       ))(v => BloopRifleConfig.Strict(BloopVersion(v)))
 
   def bloopDefaultJvmOptions(logger: Logger): List[String] = {
-    val file = new File(bloopGlobalOptionsFile)
-    if (file.exists() && file.isFile())
+    val filePath = os.Path(bloopGlobalOptionsFile, Os.pwd)
+    if (os.exists(filePath) && os.isFile(filePath))
       try {
-        val reader = new BufferedReader(new FileReader(file))
-        val gson   = new Gson()
-        val json   = gson.fromJson(reader, classOf[BloopJson])
-        json.javaOptions.toList
+        val json = ujson.read(
+          os.read(filePath: os.ReadablePath, charSet = Codec(Charset.defaultCharset()))
+        )
+        val bloopJson = upickle.default.read(json)(BloopJson.jsonCodec)
+        bloopJson.javaOptions
       }
       catch {
         case e: Throwable =>
+          System.err.println(s"Error parsing global bloop config in '$filePath':")
           e.printStackTrace()
           List.empty
       }
     else {
-      logger.debug(s"Bloop global options file '${file.toPath().toAbsolutePath()}' not found.")
+      logger.debug(s"Bloop global options file '$filePath' not found.")
       List.empty
     }
   }