Skip to content

Commit 7653717

Browse files
committed
Fix ci and formatting
1 parent debb37f commit 7653717

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ jobs:
7171
.github/setup-test-projects.sh &&\
7272
./mill -i 'backend[_].test.compile' &&\
7373
./mill -i 'frontend[_].test.compile' &&\
74-
./mill -i 'backend[2.12.18].test' &&\
75-
./mill -i 'frontend[2.12.18].test'
74+
./mill -i 'backend[2.12.19].test' &&\
75+
./mill -i 'frontend[2.12.19].test'
7676
shell: bash
7777

7878
jvm-tests:

bloop-rifle/src/bloop/rifle/internal/Operations.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,7 @@ object Operations {
144144
case s: BloopRifleConfig.Address.DomainSocket =>
145145
val writeOutputToOpt0 =
146146
if (bloopServerSupportsFileTruncating) Some(s.outputPath)
147-
else None
148-
(Seq(s"daemon:${s.path}"), "bloop.Bloop", writeOutputToOpt0)
147+
else None(Seq(s"daemon:${s.path}"), "bloop.Bloop", writeOutputToOpt0)
149148
}
150149

151150
val extraJavaOpts =

bloop-rifle/src/bloop/rifle/internal/SnailgunClient.scala

+2-4
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,10 @@ class SnailgunClient(openSocket: () => Socket) extends snailgun.Client {
3939
catch {
4040
case t: SocketException =>
4141
logger.debug("Tracing an ignored socket exception...")
42-
logger.trace(t)
43-
()
42+
logger.trace(t)()
4443
case t: SocketExceptionLike =>
4544
logger.debug("Tracing an ignored socket exception-like...")
46-
logger.trace(t)
47-
()
45+
logger.trace(t)()
4846
}
4947
}
5048
}

build.sc

+1-1
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ object bridges extends Module {
542542

543543
object `scala-native-04` extends Cross[ScalaNative04](Dependencies.scalaVersions: _*)
544544
object `scala-native-05` extends Cross[ScalaNative05](Dependencies.scalaVersions: _*)
545-
545+
546546
class ScalaNative04(val crossScalaVersion: String) extends ScalaNative(crossScalaVersion, 4)
547547
class ScalaNative05(val crossScalaVersion: String) extends ScalaNative(crossScalaVersion, 5)
548548

frontend/src/test/scala/bloop/bsp/BspMetalsClientSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class BspMetalsClientSpec(
2828
override val protocol: BspProtocol
2929
) extends BspBaseSuite {
3030
private val testedScalaVersion = BuildInfo.scalaVersion
31-
private val semanticdbVersion = "4.8.4"
31+
private val semanticdbVersion = "4.9.2"
3232
private val javaSemanticdbVersion = "0.5.7"
3333

3434
private val semanticdbJar = s"semanticdb-scalac_$testedScalaVersion-$semanticdbVersion.jar"

0 commit comments

Comments
 (0)