Merge pull request #166 from tgodzik/another-update2

Update to latest changes in Bloop
scala-cli · May 21, 2024 · 006bc6e · 006bc6e
2 parents cf0e8bd + 9d6fb89
commit 006bc6e
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 13 deletions.
diff --git a/backend/src/main/scala/sbt/internal/inc/bloop/internal/BloopNameHashing.scala b/backend/src/main/scala/sbt/internal/inc/bloop/internal/BloopNameHashing.scala
@@ -111,7 +111,7 @@ private final class BloopNameHashing(
               )
             debug("\nChanges:\n" + newApiChanges)
             val nextInvalidations = invalidateAfterInternalCompilation(
-              current.relations,
+              current,
               newApiChanges,
               recompiledClasses,
               cycleNum >= options.transitiveStep,

diff --git a/build.sc b/build.sc
@@ -17,7 +17,7 @@ import scala.concurrent.duration.{Duration, DurationInt}
 
 object Dependencies {
   def scala212 = "2.12.19"
-  def scala213 = "2.13.13"
+  def scala213 = "2.13.14"
 
   def scalaVersions = Seq(scala212, scala213)
 
@@ -53,7 +53,7 @@ object Dependencies {
   def jsonrpc4s              = ivy"io.github.alexarchambault.bleep::jsonrpc4s:0.1.1"
   def junit                  = ivy"com.github.sbt:junit-interface:0.13.3"
   def libdaemonjvm           = ivy"io.github.alexarchambault.libdaemon::libdaemon:0.0.11"
-  def libraryManagement      = ivy"org.scala-sbt::librarymanagement-ivy:1.9.3"
+  def libraryManagement      = ivy"org.scala-sbt::librarymanagement-ivy:1.10.0"
   def log4j                  = ivy"org.apache.logging.log4j:log4j-core:2.23.0"
   def logback                = ivy"ch.qos.logback:logback-classic:1.4.14"
   def macroParadise          = ivy"org.scalamacros:::paradise:2.1.1"
@@ -62,9 +62,9 @@ object Dependencies {
   def nailgun                = ivy"io.github.alexarchambault.bleep:nailgun-server:1.0.7"
   def osLib                  = ivy"com.lihaoyi::os-lib:0.9.0"
   def pprint                 = ivy"com.lihaoyi::pprint:0.9.0"
-  def sbtTestAgent           = ivy"org.scala-sbt:test-agent:1.9.9"
+  def sbtTestAgent           = ivy"org.scala-sbt:test-agent:1.10.0"
   def sbtTestInterface       = ivy"org.scala-sbt:test-interface:1.0"
-  def scalaDebugAdapter      = ivy"ch.epfl.scala::scala-debug-adapter:4.0.3"
+  def scalaDebugAdapter      = ivy"ch.epfl.scala::scala-debug-adapter:4.1.1"
   def scalaJsLinker1         = ivy"org.scala-js::scalajs-linker:$scalaJs1Version"
   def scalaJsEnvs1           = ivy"org.scala-js::scalajs-js-envs:$scalaJsEnvsVersion"
   def scalaJsEnvNode1        = ivy"org.scala-js::scalajs-env-nodejs:$scalaJsEnvsVersion"
@@ -79,7 +79,7 @@ object Dependencies {
   def svm           = ivy"org.graalvm.nativeimage:svm:$graalvmVersion"
   def utest         = ivy"com.lihaoyi::utest:0.8.3"
   def xxHashLibrary = ivy"net.jpountz.lz4:lz4:1.3.0"
-  def zinc          = ivy"org.scala-sbt::zinc:1.9.5"
+  def zinc          = ivy"org.scala-sbt::zinc:1.10.0"
   def zipkinSender  = ivy"io.zipkin.reporter2:zipkin-sender-urlconnection:2.17.2"
   def zt            = ivy"org.zeroturnaround:zt-zip:1.17"
 

diff --git a/frontend/src/main/scala/bloop/bsp/BloopBspServices.scala b/frontend/src/main/scala/bloop/bsp/BloopBspServices.scala
@@ -682,11 +682,10 @@ final class BloopBspServices(
                       val dapLogger = new DebugServerLogger(logger)
                       val resolver = new BloopDebugToolsResolver(logger)
                       val handler =
-                        DebugServer.start(
+                        DebugServer.run(
                           debuggee,
                           resolver,
                           dapLogger,
-                          autoCloseSession = true,
                           gracePeriod = Duration(5, TimeUnit.SECONDS)
                         )(ioScheduler)
                       val listenAndUnsubscribe = Task

diff --git a/frontend/src/test/resources/cross-test-build-scala-native-0.4/build.sbt b/frontend/src/test/resources/cross-test-build-scala-native-0.4/build.sbt
@@ -6,7 +6,7 @@ lazy val `test-project` =
     .withoutSuffixFor(JVMPlatform)
     .settings(
       name := "test-project",
-      scalaVersion := "2.13.13",
+      scalaVersion := "2.13.14",
       mainClass in (Compile, run) := Some("hello.App")
     )
 

diff --git a/frontend/src/test/resources/cross-test-build-scala-native-0.5/build.sbt b/frontend/src/test/resources/cross-test-build-scala-native-0.5/build.sbt
@@ -6,7 +6,7 @@ lazy val `test-project` =
     .withoutSuffixFor(JVMPlatform)
     .settings(
       name := "test-project",
-      scalaVersion := "2.13.13",
+      scalaVersion := "2.13.14",
       mainClass in (Compile, run) := Some("hello.App")
     )
 

diff --git a/frontend/src/test/resources/cross-test-build-scala-native-0.5/project/build.properties b/frontend/src/test/resources/cross-test-build-scala-native-0.5/project/build.properties
@@ -1,2 +1,2 @@
-sbt.version=1.9.9
+sbt.version=1.10.0
 
diff --git a/frontend/src/test/scala/bloop/ScalaVersionsSpec.scala b/frontend/src/test/scala/bloop/ScalaVersionsSpec.scala
@@ -77,7 +77,7 @@ object ScalaVersionsSpec extends bloop.testing.BaseSuite {
     "2.13.10",
     "3.1.3",
     "3.2.1",
-    "2.13.13"
+    "2.13.14"
   )
 
   val allVersions = scalaVersions

diff --git a/frontend/src/test/scala/bloop/dap/DebugServerSpec.scala b/frontend/src/test/scala/bloop/dap/DebugServerSpec.scala
@@ -1209,7 +1209,7 @@ object DebugServerSpec extends DebugBspBaseSuite {
 
     val config = DebugConfig.default.copy(gracePeriod = gracePeriod)
     val server = DebugServer(debuggee, resolver, dapLogger, config = config)(defaultScheduler)
-    Task.fromFuture(server.start()).runAsync(defaultScheduler)
+    Task.fromFuture(server.run()).runAsync(defaultScheduler)
 
     val testServer = new TestServer(server)
     f(testServer)