[2.x] ci: Update sbt-java-formatter (#9098)

This commit is contained in:
Matthias Kurz 2026-04-21 18:19:44 +02:00 committed by GitHub
parent d2da9ce1e6
commit 1f0b0e1bfa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 3 deletions

View File

@ -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"

View File

@ -42,7 +42,9 @@ public interface Problem {
return Optional.empty();
}
/** @deprecated use {@link #diagnosticRelatedInformation()} instead. */
/**
* @deprecated use {@link #diagnosticRelatedInformation()} instead.
*/
@Deprecated
default List<DiagnosticRelatedInformation> diagnosticRelatedInforamation() {
return diagnosticRelatedInformation();

View File

@ -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")

View File

@ -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();