diff --git a/build.sbt b/build.sbt index 92d512d63..f2eb78f1a 100644 --- a/build.sbt +++ b/build.sbt @@ -17,6 +17,7 @@ ThisBuild / version := { ThisBuild / versionScheme := Some("early-semver") ThisBuild / scalafmtOnCompile := !(Global / insideCI).value ThisBuild / Test / scalafmtOnCompile := !(Global / insideCI).value +ThisBuild / javafmtFormatterCompatibleJavaVersion := 17 // ThisBuild / turbo := true ThisBuild / usePipelining := false // !(Global / insideCI).value ThisBuild / organization := "org.scala-sbt" diff --git a/internal/util-interface/src/main/java/xsbti/Problem.java b/internal/util-interface/src/main/java/xsbti/Problem.java index 5890870b9..545f222cd 100644 --- a/internal/util-interface/src/main/java/xsbti/Problem.java +++ b/internal/util-interface/src/main/java/xsbti/Problem.java @@ -42,7 +42,9 @@ public interface Problem { return Optional.empty(); } - /** @deprecated use {@link #diagnosticRelatedInformation()} instead. */ + /** + * @deprecated use {@link #diagnosticRelatedInformation()} instead. + */ @Deprecated default List diagnosticRelatedInforamation() { return diagnosticRelatedInformation(); diff --git a/project/plugins.sbt b/project/plugins.sbt index 996b30b55..cfc89cdac 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,7 +8,7 @@ addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.8.0") addSbtPlugin("com.github.sbt" % "sbt-header" % "5.11.0") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.5") -addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.9.0") +addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.12.0") addSbtPlugin("org.scalameta" % "sbt-native-image" % "0.4.0") addDependencyTreePlugin addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.5") diff --git a/worker/src/main/java/sbt/internal/worker1/ForkTestMain.java b/worker/src/main/java/sbt/internal/worker1/ForkTestMain.java index 27f4e9ca1..8c12ef436 100644 --- a/worker/src/main/java/sbt/internal/worker1/ForkTestMain.java +++ b/worker/src/main/java/sbt/internal/worker1/ForkTestMain.java @@ -321,7 +321,8 @@ public class ForkTestMain { String params = this.gson.toJson(info, ForkGroupStart.class); String notification = String.format( - "{ \"jsonrpc\": \"2.0\", \"method\": \"startTestGroup\", \"params\": %s, \"re\": %d }", + "{ \"jsonrpc\": \"2.0\", \"method\": \"startTestGroup\", \"params\": %s, \"re\": %d" + + " }", params, this.id); this.originalOut.println(notification); this.originalOut.flush();