Merge pull request #3020 from tgodzik/switch-bloop

refactor: Switch to original fork of Bloop

Author: tgodzik

gcbenchmark/gcbenchmark.scala

@@ -44,7 +44,7 @@ object Main {
 
   def bloopPid: Option[Int] = {
     val processes = os.proc("jps", "-l").call().out.text()
-    "(\\d+) bloop[.]Bloop".r
+    "(\\d+) bloop[.]BloopServer".r
       .findFirstMatchIn(processes)
       .map(_.group(1).toInt)
   }

modules/build/src/main/scala/scala/build/Bloop.scala

@@ -85,25 +85,23 @@ object Bloop {
   def bloopClassPath(
     logger: Logger,
     cache: FileCache[Task]
-  ): Either[BuildException, (Seq[File], Boolean)] =
+  ): Either[BuildException, Seq[File]] =
     bloopClassPath(logger, cache, BloopRifleConfig.defaultVersion)
 
   def bloopClassPath(
     logger: Logger,
     cache: FileCache[Task],
     bloopVersion: String
-  ): Either[BuildException, (Seq[File], Boolean)] = either {
+  ): Either[BuildException, Seq[File]] = either {
     val moduleStr = BloopRifleConfig.defaultModule
     val mod = value {
       ModuleParser.parse(moduleStr)
         .left.map(err => new ModuleFormatError(moduleStr, err, Some("Bloop")))
     }
-    val dep             = DependencyLike(mod, bloopVersion)
-    val sv              = BloopRifleConfig.defaultScalaVersion
-    val sbv             = ScalaVersion.binary(sv)
-    val params          = ScalaParameters(sv, sbv)
-    val cp              = value(bloopClassPath(dep, params, logger, cache))
-    val isScalaCliBloop = moduleStr.startsWith(BloopRifleConfig.scalaCliBloopOrg + ":")
-    (cp, isScalaCliBloop)
+    val dep    = DependencyLike(mod, bloopVersion)
+    val sv     = BloopRifleConfig.defaultScalaVersion
+    val sbv    = ScalaVersion.binary(sv)
+    val params = ScalaParameters(sv, sbv)
+    value(bloopClassPath(dep, params, logger, cache))
   }
 }

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

@@ -183,7 +183,7 @@ class BspServer(
     val res = new b.InitializeBuildResult(
       "scala-cli",
       Constants.version,
-      bloop.rifle.internal.Constants.bspVersion,
+      bloop.rifle.internal.BuildInfo.bspVersion,
       capabilities
     )
     val buildComesFromIntelliJ = params.getDisplayName.toLowerCase.contains("intellij")

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

@@ -53,6 +53,9 @@ case class TestLogger(info: Boolean = true, debug: Boolean = false) extends Logg
         def bloopBspStdout: Option[java.io.OutputStream] = Some(System.out)
         def bloopCliInheritStderr: Boolean               = true
         def bloopCliInheritStdout: Boolean               = true
+        def debug(msg: => String): Unit = {
+          System.err.println(msg)
+        }
         def debug(msg: => String, ex: Throwable): Unit = {
           System.err.println(msg)
           if (ex != null) ex.printStackTrace(System.err)

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

@@ -1,6 +1,6 @@
 package scala.cli.commands.bloop
 
-import bloop.rifle.internal.{Constants, Operations}
+import bloop.rifle.internal.Operations
 import bloop.rifle.{BloopRifle, BloopRifleConfig, BloopThreads}
 import caseapp.core.RemainingArgs
 

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

@@ -1,6 +1,6 @@
 package scala.cli.commands.bloop
 
-import bloop.rifle.internal.Constants
+import bloop.rifle.internal.BuildInfo
 import bloop.rifle.{BloopRifle, BloopRifleConfig, BloopThreads}
 import caseapp.*
 
@@ -64,7 +64,7 @@ object BloopStart extends ScalaCommand[BloopStartOptions] {
         bloopRifleConfig,
         threads.startServerChecks,
         logger.bloopRifleLogger,
-        Constants.bloopVersion,
+        BuildInfo.version,
         bloopRifleConfig.javaPath
       )
       Await.result(f, Duration.Inf)

modules/cli/src/main/scala/scala/cli/commands/setupide/SetupIde.scala

@@ -167,7 +167,7 @@ object SetupIde extends ScalaCommand[SetupIdeOptions] {
       bspName,
       bspArgs.asJava,
       Constants.version,
-      bloop.rifle.internal.Constants.bspVersion,
+      bloop.rifle.internal.BuildInfo.bspVersion,
       List("scala", "java").asJava
     )
 

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

@@ -1,6 +1,6 @@
 package scala.cli.commands.shared
 
-import bloop.rifle.internal.Constants
+import bloop.rifle.internal.BuildInfo
 import bloop.rifle.{BloopRifleConfig, BloopVersion, BspConnectionAddress}
 import caseapp.*
 import com.github.plokhotnyuk.jsoniter_scala.core.*
@@ -192,7 +192,7 @@ final case class SharedCompilationServerOptions(
       .map(_.trim)
       .filter(_.nonEmpty)
       .fold[BloopRifleConfig.BloopVersionConstraint](BloopRifleConfig.AtLeast(
-        BloopVersion(Constants.bloopVersion)
+        BloopVersion(BuildInfo.version)
       ))(v => BloopRifleConfig.Strict(BloopVersion(v)))
 
   def bloopDefaultJvmOptions(logger: Logger): Option[List[String]] = {

modules/cli/src/main/scala/scala/cli/internal/CliLogger.scala

@@ -160,6 +160,8 @@ class CliLogger(
   def bloopRifleLogger =
     new BloopRifleLogger {
       def info(msg: => String) = logger.message(msg)
+      def debug(msg: => String) =
+        if (verbosity >= 3) logger.debug(msg)
       def debug(msg: => String, ex: Throwable) =
         if (verbosity >= 3) {
           logger.debug(msg)

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

@@ -83,7 +83,7 @@ class BloopTests extends ScalaCliSuite {
   test("bloop exit works") {
     def bloopRunning(): Boolean = {
       val javaProcesses = os.proc("jps", "-l").call().out.text()
-      javaProcesses.contains("bloop.Bloop")
+      javaProcesses.contains("bloop.BloopServer")
     }
 
     val inputs = TestInputs.empty