Skip to content

Commit 87910ff

Browse files
authored
Bump Bloop to 2.1.0 (was 2.0.19) (#4295)
1 parent d85dee9 commit 87910ff

3 files changed

Lines changed: 10 additions & 9 deletions

File tree

modules/build/src/test/scala/scala/build/tests/util/BloopServer.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ object BloopServer {
2020
val bloopConfig = {
2121
val base = BloopRifleConfig.default(
2222
bloopAddress,
23-
v => Bloop.bloopClassPath(Logger.nop, FileCache(), v),
24-
directories.bloopWorkingDir.toIO
23+
v => Bloop.bloopClassPath(Logger.nop, FileCache(), v).map(_.map(_.toPath)),
24+
directories.bloopWorkingDir.toNIO
2525
)
2626
base.copy(
2727
javaPath =

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ import coursier.cache.FileCache
99
import coursier.core.Version as Ver
1010
import coursier.util.Task
1111

12-
import java.io.File
13-
import java.nio.file.{AtomicMoveNotSupportedException, FileAlreadyExistsException, Files, Paths}
12+
import java.nio.file.{
13+
AtomicMoveNotSupportedException, FileAlreadyExistsException, Files, Path, Paths
14+
}
1415
import java.util.Random
1516

1617
import scala.build.internal.Util
@@ -131,7 +132,7 @@ final case class SharedCompilationServerOptions(
131132
dir
132133
}
133134

134-
private def bspSocketFile(directories: => scala.build.Directories): File = {
135+
private def bspSocketFile(directories: => scala.build.Directories): Path = {
135136
val (socket, deleteOnExit) = bloopBspSocket match {
136137
case Some(path) =>
137138
(os.Path(path, Os.pwd), false)
@@ -153,7 +154,7 @@ final case class SharedCompilationServerOptions(
153154
Files.deleteIfExists(socket.toNIO)
154155
}
155156
)
156-
socket.toIO.getCanonicalFile
157+
socket.toIO.getCanonicalFile.toPath
157158
}
158159

159160
def defaultBspSocketOrPort(
@@ -261,8 +262,8 @@ final case class SharedCompilationServerOptions(
261262
.getOrElse(directories.bloopWorkingDir)
262263
val baseConfig = BloopRifleConfig.default(
263264
address,
264-
v => Bloop.bloopClassPath(logger, cache, v),
265-
workingDir.toIO
265+
v => Bloop.bloopClassPath(logger, cache, v).map(_.map(_.toPath)),
266+
workingDir.toNIO
266267
)
267268

268269
baseConfig.copy(

project/deps/package.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ object Deps {
137137
def signingCliJvmVersion = Java.defaultJava
138138
def javaSemanticdb = "0.10.0"
139139
def javaClassName = "0.1.9"
140-
def bloop = "2.0.19"
140+
def bloop = "2.1.0"
141141
def sbtVersion = "1.12.4"
142142
def mill012Version = "0.12.17"
143143
def mill1Version = BuildInfo.millVersion

0 commit comments

Comments
 (0)