From ac59cf98933a70faf016b589b6e41e8424f7c62c Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Thu, 16 Apr 2026 13:23:45 +0200 Subject: [PATCH 1/2] bump: google-java-format 1.35.0 (was 1.24.0) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 3887e00..e502288 100644 --- a/build.sbt +++ b/build.sbt @@ -17,7 +17,7 @@ lazy val plugin = project developers := List( Developer("ktoso", "Konrad 'ktoso' Malawski", "", url("https://github.com/ktoso"))), // Compile the plugin against the Java 11-compatible google-java-format API line; actual formatter execution uses a separately selected forked runtime. - libraryDependencies ++= Seq("com.google.googlejavaformat" % "google-java-format" % "1.24.0"), + libraryDependencies ++= Seq("com.google.googlejavaformat" % "google-java-format" % "1.35.0"), startYear := Some(2015), description := "Formats Java code in your project.", licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html")), From 3121944c977aafcb34e8f5e85c81e2b161390168 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Thu, 16 Apr 2026 13:23:45 +0200 Subject: [PATCH 2/2] Update google-java-format runtime mapping Executed command: bash scripts/update-google-java-format-runtime.sh --- README.md | 2 +- build.sbt | 2 +- plugin/src/main/scala/com/github/sbt/JavaFormatterPlugin.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e4376fd..778dbd7 100644 --- a/README.md +++ b/README.md @@ -111,7 +111,7 @@ Set any of them to `false` to pass the corresponding `--skip-...` flag to `googl - `11` -> `google-java-format 1.24.0` - `17` -> `google-java-format 1.28.0` -- `21` -> `google-java-format 1.34.0` +- `21` -> `google-java-format 1.35.0` If the selected formatter runtime is newer than the Java used to launch the formatter JVM, either: diff --git a/build.sbt b/build.sbt index e502288..3887e00 100644 --- a/build.sbt +++ b/build.sbt @@ -17,7 +17,7 @@ lazy val plugin = project developers := List( Developer("ktoso", "Konrad 'ktoso' Malawski", "", url("https://github.com/ktoso"))), // Compile the plugin against the Java 11-compatible google-java-format API line; actual formatter execution uses a separately selected forked runtime. - libraryDependencies ++= Seq("com.google.googlejavaformat" % "google-java-format" % "1.35.0"), + libraryDependencies ++= Seq("com.google.googlejavaformat" % "google-java-format" % "1.24.0"), startYear := Some(2015), description := "Formats Java code in your project.", licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html")), diff --git a/plugin/src/main/scala/com/github/sbt/JavaFormatterPlugin.scala b/plugin/src/main/scala/com/github/sbt/JavaFormatterPlugin.scala index 3d5d22a..8952848 100644 --- a/plugin/src/main/scala/com/github/sbt/JavaFormatterPlugin.scala +++ b/plugin/src/main/scala/com/github/sbt/JavaFormatterPlugin.scala @@ -259,7 +259,7 @@ object JavaFormatterPlugin extends AutoPlugin { compatibleJavaVersion match { case 11 => "1.24.0" case 17 => "1.28.0" - case 21 => "1.34.0" + case 21 => "1.35.0" case other => throw new MessageOnlyException( s"Unsupported javafmtFormatterCompatibleJavaVersion: $other. Expected one of: 11, 17, 21.")