chore: Update bsp4s to 2.1.0-M6

Author: tgodzik

bloop-rifle/src/bloop/rifle/BloopRifleLogger.scala

@@ -37,13 +37,13 @@ trait BloopRifleLogger { self =>
 object BloopRifleLogger {
   def nop: BloopRifleLogger =
     new BloopRifleLogger {
-      def info(msg: => String)                 = {}
-      def debug(msg: => String, ex: Throwable) = {}
-      def error(msg: => String, ex: Throwable) = {}
-      def error(msg: => String)                = {}
-      def bloopBspStdout                       = None
-      def bloopBspStderr                       = None
-      def bloopCliInheritStdout                = false
-      def bloopCliInheritStderr                = false
+      def info(msg: => String)                         = {}
+      def debug(msg: => String, ex: Throwable)         = {}
+      def error(msg: => String, ex: Throwable)         = {}
+      def error(msg: => String)                        = {}
+      def bloopBspStdout: Option[java.io.OutputStream] = None
+      def bloopBspStderr: Option[java.io.OutputStream] = None
+      def bloopCliInheritStdout                        = false
+      def bloopCliInheritStderr                        = false
     }
 }

build.sc

@@ -31,7 +31,7 @@ object Dependencies {
   def bloopConfig       = ivy"ch.epfl.scala::bloop-config:1.5.5"
   def brave             = ivy"io.zipkin.brave:brave:5.16.0"
   def bsp4j             = ivy"ch.epfl.scala:bsp4j:2.1.0-M6"
-  def bsp4s             = ivy"ch.epfl.scala::bsp4s:2.1.0-M5"
+  def bsp4s             = ivy"ch.epfl.scala::bsp4s:2.1.0-M6"
   def caseApp           = ivy"com.github.alexarchambault::case-app:2.0.6"
   def caseApp21         = ivy"com.github.alexarchambault::case-app:2.1.0-M15"
   def collectionCompat  = ivy"org.scala-lang.modules::scala-collection-compat:2.9.0"

cli/src/bloop/cli/Bloop.scala

@@ -1,14 +1,15 @@
 package bloop.cli
 
 import caseapp.core.app.CommandsEntryPoint
+import caseapp.core.app.Command
 
 object Bloop extends CommandsEntryPoint {
-  def progName = "bloop"
-  def commands = Seq(
+  def progName: String = "bloop"
+  def commands: Seq[Command[_]] = Seq(
     Exit,
     Output,
     Start,
     Status
   )
-  override def defaultCommand = Some(Default)
+  override def defaultCommand: Option[Command[_]] = Some(Default)
 }

cli/src/bloop/cli/options/LoggingOptions.scala

@@ -4,6 +4,7 @@ import caseapp._
 import coursier.cache.loggers.RefreshLogger
 import bloop.rifle.BloopRifleLogger
 import bloop.cli.Logger
+import java.io.OutputStream
 
 // format: off
 final case class LoggingOptions(
@@ -38,10 +39,10 @@ final case class LoggingOptions(
         RefreshLogger.create()
       def bloopRifleLogger: BloopRifleLogger =
         new BloopRifleLogger {
-          def bloopBspStderr        = None
-          def bloopBspStdout        = None
-          def bloopCliInheritStderr = false
-          def bloopCliInheritStdout = false
+          def bloopBspStderr: Option[OutputStream] = None
+          def bloopBspStdout: Option[OutputStream] = None
+          def bloopCliInheritStderr: Boolean       = false
+          def bloopCliInheritStdout: Boolean       = false
           def debug(msg: => String, ex: Throwable): Unit =
             if (verbosity >= 2) {
               System.err.println(msg)