diff --git a/CHANGES.md b/CHANGES.md index 1ab0bdfca1..6f6ce2bf31 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,8 +17,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Support configuring the Equo P2 cache. ([#2238](https://github.com/diffplug/spotless/pull/2238)) * Add explicit support for JSONC / CSS via biome, via the file extensions `.css` and `.jsonc`. ([#2259](https://github.com/diffplug/spotless/pull/2259)) -* Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279)) * Bump default `buf` version to latest `1.24.0` -> `1.44.0`. ([#2291](https://github.com/diffplug/spotless/pull/2291)) +* Bump default `google-java-format` version to latest `1.23.0` -> `1.24.0`. ([#2294](https://github.com/diffplug/spotless/pull/2294)) +* Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279)) ### Fixed * Java import order, ignore duplicate group entries. ([#2293](https://github.com/diffplug/spotless/pull/2293)) diff --git a/lib/build.gradle b/lib/build.gradle index 558e2da648..b3478a8921 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -93,7 +93,7 @@ dependencies { gherkinCompileOnly 'io.cucumber:gherkin-utils:9.0.0' gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.16' // googleJavaFormat - googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.23.0' + googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.24.0' // gson gsonCompileOnly 'com.google.code.gson:gson:2.11.0' // jackson diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java index 3a74bdcf85..cdf44a2b28 100644 --- a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java +++ b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java @@ -121,7 +121,7 @@ private static FormatterStep createInternally(String groupArtifact, String versi .addMin(11, "1.8") // we only support google-java-format >= 1.8 due to api changes .addMin(16, "1.10.0") // java 16 requires at least 1.10.0 due to jdk api changes in JavaTokenizer .addMin(21, "1.17.0") // java 21 requires at least 1.17.0 due to https://github.com/google/google-java-format/issues/898 - .add(11, "1.23.0"); // default version + .add(11, "1.24.0"); // default version public static String defaultGroupArtifact() { return MAVEN_COORDINATE; diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index b13b5cd5d2..fde6696b03 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -11,8 +11,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( formatting step. Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable). ([#2259](https://github.com/diffplug/spotless/pull/2259)) ### Changed -* Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279)) * Bump default `buf` version to latest `1.24.0` -> `1.44.0`. ([#2291](https://github.com/diffplug/spotless/pull/2291)) +* Bump default `google-java-format` version to latest `1.23.0` -> `1.24.0`. ([#2294](https://github.com/diffplug/spotless/pull/2294)) +* Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279)) ### Fixed * Java import order, ignore duplicate group entries. ([#2293](https://github.com/diffplug/spotless/pull/2293)) diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index 21f2113238..f0f3c5dcbd 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -11,6 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Add explicit support for CSS via biome. Formatting CSS via biome was already supported as a general formatting step. Biome supports formatting CSS as of 1.8.0 (experimental, opt-in) and 1.9.0 (stable). ([#2259](https://github.com/diffplug/spotless/pull/2259)) +* Bump default `google-java-format` version to latest `1.23.0` -> `1.24.0`. ([#2294](https://github.com/diffplug/spotless/pull/2294)) * Bump default `jackson` version to latest `2.17.2` -> `2.18.0`. ([#2279](https://github.com/diffplug/spotless/pull/2279)) ### Fixed * Java import order, ignore duplicate group entries. ([#2293](https://github.com/diffplug/spotless/pull/2293))