From 67db2c801d543990b19dd6ae8a82dc65944194da Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 15 Sep 2026 05:47:14 +0000
Subject: [PATCH 1/3] Update dependency
 com.google.googlejavaformat:google-java-format to v1.36.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0c5d13c258..87e1c9fec1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -50,7 +50,7 @@ diktat-runner = "com.saveourtool.diktat:diktat-runner:2.0.0"
 flexmark-all = "com.vladsch.flexmark:flexmark-all:0.64.8"
 freshmark = "com.diffplug.freshmark:freshmark:1.3.1"
 gherkin-utils = "io.cucumber:gherkin-utils:10.0.0"
-google-java-format = "com.google.googlejavaformat:google-java-format:1.30.0"
+google-java-format = "com.google.googlejavaformat:google-java-format:1.36.1"
 gson = "com.google.code.gson:gson:2.14.0"
 json-simple = "org.json:json:20210307"
 ktfmt = "com.facebook:ktfmt:0.64"

From 117ecba1266bddd6aa6a4a95d99a65d778825342 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 15 Sep 2026 15:30:39 +0800
Subject: [PATCH 2/3] Update changelogs for default formatter version bump
 (#3075)

---
 CHANGES.md               | 1 +
 plugin-gradle/CHANGES.md | 1 +
 plugin-maven/CHANGES.md  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 75ae39ee0e..2c7e379c06 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,6 +22,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 - Bump default `javaparser` version `3.27.1` -> `3.28.2`. ([#3065](https://github.com/diffplug/spotless/pull/3065))
 - Bump default `palantir-java-format` version `2.80.0` -> `2.98.0`. ([#3068](https://github.com/diffplug/spotless/pull/3068))
 - Bump default `scalafmt` version `3.8.1` -> `3.11.5`. ([#2173](https://github.com/diffplug/spotless/pull/2173))
+- Bump default `google-java-format` version `1.30.0` -> `1.36.1`. ([#3075](https://github.com/diffplug/spotless/pull/3075))
 
 ### Fixed
 - `VersionCatalogStep` preserves entries when comments contain unmatched brackets, preserves commas inside quoted strings, and keeps significant line boundaries in multiline entries. ([#3042](https://github.com/diffplug/spotless/pull/3042))
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
index 66f5fb2d0b..1e4e7d84d3 100644
--- a/plugin-gradle/CHANGES.md
+++ b/plugin-gradle/CHANGES.md
@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 - Bump default `javaparser` version `3.27.1` -> `3.28.2`. ([#3065](https://github.com/diffplug/spotless/pull/3065))
 - Bump default `palantir-java-format` version `2.80.0` -> `2.98.0`. ([#3068](https://github.com/diffplug/spotless/pull/3068))
 - Bump default `scalafmt` version `3.8.1` -> `3.11.5`. ([#2173](https://github.com/diffplug/spotless/pull/2173))
+- Bump default `google-java-format` version `1.30.0` -> `1.36.1`. ([#3075](https://github.com/diffplug/spotless/pull/3075))
 
 ### Fixed
 - `versionCatalog()` preserves entries when comments contain unmatched brackets, preserves commas inside quoted strings, and keeps significant line boundaries in multiline entries. ([#3042](https://github.com/diffplug/spotless/pull/3042))
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
index 674a6ee2ed..7ca3223d0c 100644
--- a/plugin-maven/CHANGES.md
+++ b/plugin-maven/CHANGES.md
@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 - Bump default `javaparser` version `3.27.1` -> `3.28.2`. ([#3065](https://github.com/diffplug/spotless/pull/3065))
 - Bump default `palantir-java-format` version `2.80.0` -> `2.98.0`. ([#3068](https://github.com/diffplug/spotless/pull/3068))
 - Bump default `scalafmt` version `3.8.1` -> `3.11.5`. ([#2173](https://github.com/diffplug/spotless/pull/2173))
+- Bump default `google-java-format` version `1.30.0` -> `1.36.1`. ([#3075](https://github.com/diffplug/spotless/pull/3075))
 
 ### Fixed
 - `<versionCatalog>` preserves entries when comments contain unmatched brackets, preserves commas inside quoted strings, and keeps significant line boundaries in multiline entries. ([#3042](https://github.com/diffplug/spotless/pull/3042))

From c32f7c0f4bb5f6b5d99b8d3ef55492dfd137d257 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 15 Sep 2026 15:30:42 +0800
Subject: [PATCH 3/3] Keep google-java-format 1.28.0 compile-only for Java 17
 compatibility

---
 gradle/pinned-libs.versions.toml | 2 +-
 lib/build.gradle.kts             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/pinned-libs.versions.toml b/gradle/pinned-libs.versions.toml
index 8d3cae34c2..9f645d1161 100644
--- a/gradle/pinned-libs.versions.toml
+++ b/gradle/pinned-libs.versions.toml
@@ -11,7 +11,7 @@ maven-plugin-annotations = { module = "org.apache.maven.plugin-tools:maven-plugi
 maven-core = { module = "org.apache.maven:maven-core", version.ref = "maven" }
 
 palantir-java-format = "com.palantir.javaformat:palantir-java-format:1.1.0"
-google-java-format = "com.google.googlejavaformat:google-java-format:1.7"
+google-java-format = "com.google.googlejavaformat:google-java-format:1.28.0"
 diktat-rules = "org.cqfn.diktat:diktat-rules:1.2.5"
 aether-api = "org.eclipse.aether:aether-api:1.1.0"
 plexus-build-api = "org.sonatype.plexus:plexus-build-api:0.0.7"
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index e552219f58..2992c4a33f 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -151,7 +151,7 @@ dependencies {
   "gherkinCompileOnly"(libs.gherkin.utils)
   "gherkinCompileOnly"(libs.slf4j.api)
   // googleJavaFormat
-  "googleJavaFormatCompileOnly"(libs.google.java.format)
+  "googleJavaFormatCompileOnly"(pinnedLibs.google.java.format)
   // gson
   "gsonCompileOnly"(libs.gson)
   // jackson