From 296dec493679b167f2afd57fa2548251bb77b276 Mon Sep 17 00:00:00 2001 From: Liam Miller-Cushon Date: Fri, 30 Oct 2026 08:24:05 -0700 Subject: [PATCH] Update the IntelliJ plugin to google-java-format 2.0.0. The plugin already calls `JavaFormatterOptions.Builder.cleanup(false)` for whitespace-only formatting, which is only available in 2.0.0, so it doesn't build against 1.36.1. PiperOrigin-RevId: 1010533401 --- idea_plugin/build.gradle.kts | 4 ++-- idea_plugin/src/main/resources/META-INF/plugin.xml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/idea_plugin/build.gradle.kts b/idea_plugin/build.gradle.kts index 2b753a5c9..132d79bf0 100644 --- a/idea_plugin/build.gradle.kts +++ b/idea_plugin/build.gradle.kts @@ -30,8 +30,8 @@ repositories { } // https://github.com/google/google-java-format/releases -val googleJavaFormatVersion = "1.36.1" -val pluginPatchVersion = "1" +val googleJavaFormatVersion = "2.0.0" +val pluginPatchVersion = "0" java { toolchain { languageVersion = JavaLanguageVersion.of(21) } diff --git a/idea_plugin/src/main/resources/META-INF/plugin.xml b/idea_plugin/src/main/resources/META-INF/plugin.xml index 20d44063c..403fd1a1f 100644 --- a/idea_plugin/src/main/resources/META-INF/plugin.xml +++ b/idea_plugin/src/main/resources/META-INF/plugin.xml @@ -35,6 +35,8 @@ ]]> +
2.0.0.0
+
Updated to use google-java-format 2.0.0.
1.36.1.1
Move settings page to Tools section.
1.36.1.0