diff --git a/CHANGES.md b/CHANGES.md index 568145ae29..a8d47ea74c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -21,6 +21,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( - Bump default `jackson` version `2.20.1` -> `2.22.2`. ([#2819](https://github.com/diffplug/spotless/pull/2819)) - 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 `google-java-format` version `1.30.0` -> `1.36.1`. ([#2706](https://github.com/diffplug/spotless/pull/2706)) ### 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/gradle/libs.versions.toml b/gradle/libs.versions.toml index ed432c524e..e5286478fd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -58,7 +58,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" diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 77c06e32d5..82abe34ca4 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -13,6 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( - Bump default `jackson` version `2.20.1` -> `2.22.2`. ([#2819](https://github.com/diffplug/spotless/pull/2819)) - 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 `google-java-format` version `1.30.0` -> `1.36.1`. ([#2706](https://github.com/diffplug/spotless/pull/2706)) ### 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 07491af14d..79dac4db50 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -13,6 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( - Bump default `jackson` version `2.20.1` -> `2.22.2`. ([#2819](https://github.com/diffplug/spotless/pull/2819)) - 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 `google-java-format` version `1.30.0` -> `1.36.1`. ([#2706](https://github.com/diffplug/spotless/pull/2706)) ### Fixed - `` 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))