Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ private final class BloopNameHashing(
)
debug("\nChanges:\n" + newApiChanges)
val nextInvalidations = invalidateAfterInternalCompilation(
current.relations,
current,
newApiChanges,
recompiledClasses,
cycleNum >= options.transitiveStep,
Expand Down
10 changes: 5 additions & 5 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"

Expand Down
3 changes: 1 addition & 2 deletions frontend/src/main/scala/bloop/bsp/BloopBspServices.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.9.9
sbt.version=1.10.0

2 changes: 1 addition & 1 deletion frontend/src/test/scala/bloop/ScalaVersionsSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/test/scala/bloop/dap/DebugServerSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down