From 234bf1f822e9ccf368839fdebadbe26166ed51bd Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Wed, 27 Mar 2024 16:48:56 +0100 Subject: [PATCH] Fix ci and formatting --- .github/workflows/ci.yml | 4 ++-- bloop-rifle/src/bloop/rifle/internal/Operations.scala | 3 +-- bloop-rifle/src/bloop/rifle/internal/SnailgunClient.scala | 6 ++---- build.sc | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d3e0d7e38b..b97965066a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,8 +71,8 @@ jobs: .github/setup-test-projects.sh &&\ ./mill -i 'backend[_].test.compile' &&\ ./mill -i 'frontend[_].test.compile' &&\ - ./mill -i 'backend[2.12.18].test' &&\ - ./mill -i 'frontend[2.12.18].test' + ./mill -i 'backend[2.12.19].test' &&\ + ./mill -i 'frontend[2.12.19].test' shell: bash jvm-tests: diff --git a/bloop-rifle/src/bloop/rifle/internal/Operations.scala b/bloop-rifle/src/bloop/rifle/internal/Operations.scala index 81755d15bf..865e510c33 100644 --- a/bloop-rifle/src/bloop/rifle/internal/Operations.scala +++ b/bloop-rifle/src/bloop/rifle/internal/Operations.scala @@ -144,8 +144,7 @@ object Operations { case s: BloopRifleConfig.Address.DomainSocket => val writeOutputToOpt0 = if (bloopServerSupportsFileTruncating) Some(s.outputPath) - else None - (Seq(s"daemon:${s.path}"), "bloop.Bloop", writeOutputToOpt0) + else None(Seq(s"daemon:${s.path}"), "bloop.Bloop", writeOutputToOpt0) } val extraJavaOpts = diff --git a/bloop-rifle/src/bloop/rifle/internal/SnailgunClient.scala b/bloop-rifle/src/bloop/rifle/internal/SnailgunClient.scala index 773d689a7d..b9a4ad8fe3 100644 --- a/bloop-rifle/src/bloop/rifle/internal/SnailgunClient.scala +++ b/bloop-rifle/src/bloop/rifle/internal/SnailgunClient.scala @@ -39,12 +39,10 @@ class SnailgunClient(openSocket: () => Socket) extends snailgun.Client { catch { case t: SocketException => logger.debug("Tracing an ignored socket exception...") - logger.trace(t) - () + logger.trace(t)() case t: SocketExceptionLike => logger.debug("Tracing an ignored socket exception-like...") - logger.trace(t) - () + logger.trace(t)() } } } diff --git a/build.sc b/build.sc index 26086d0f45..3d64c217ba 100644 --- a/build.sc +++ b/build.sc @@ -542,7 +542,7 @@ object bridges extends Module { object `scala-native-04` extends Cross[ScalaNative04](Dependencies.scalaVersions: _*) object `scala-native-05` extends Cross[ScalaNative05](Dependencies.scalaVersions: _*) - + class ScalaNative04(val crossScalaVersion: String) extends ScalaNative(crossScalaVersion, 4) class ScalaNative05(val crossScalaVersion: String) extends ScalaNative(crossScalaVersion, 5)