Skip to content

Commit 152c937

Browse files
authored
Bump default gjf 1.16.0 -> 1.17.0 (#1710)
2 parents 587c8d8 + 34fb099 commit 152c937

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

CHANGES.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
1818
* When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
1919
* Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.38.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
2020
### Changes
21-
* Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
21+
* Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710))
2222
* Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696))
2323
* Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time.
24+
* Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
2425

2526
## [2.38.0] - 2023-04-06
2627
### Added

lib/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ dependencies {
8181
gherkinCompileOnly 'io.cucumber:gherkin-utils:8.0.2'
8282
gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.0'
8383
// googleJavaFormat
84-
googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.16.0'
84+
googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.17.0'
8585
// gson
8686
gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
8787
// jackson

lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ public static FormatterStep create(String groupArtifact, String version, String
7272
static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME)
7373
.addMin(11, "1.8") // we only support google-java-format >= 1.8 due to api changes
7474
.addMin(16, "1.10.0") // java 16 requires at least 1.10.0 due to jdk api changes in JavaTokenizer
75-
.add(11, "1.16.0"); // default version
75+
.addMin(21, "1.17.0") // java 21 requires at least 1.17.0 due to https://github.com/google/google-java-format/issues/898
76+
.add(11, "1.17.0"); // default version
7677

7778
public static String defaultGroupArtifact() {
7879
return MAVEN_COORDINATE;

plugin-gradle/CHANGES.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
1111
* When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
1212
* Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `6.18.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
1313
### Changes
14-
* Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
14+
* Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710))
1515
* Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696))
1616
* Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time.
17+
* Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
1718

1819
## [6.18.0] - 2023-04-06
1920
### Added

plugin-maven/CHANGES.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
1111
* When P2 download fails, indicate the responsible formatter. ([#1698](https://github.com/diffplug/spotless/issues/1698))
1212
* Fixed a regression which changed the import sorting order in `googleJavaFormat` introduced in `2.36.0`. ([#1680](https://github.com/diffplug/spotless/pull/1680))
1313
### Changes
14-
* Bump default sortpom version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
14+
* Bump default `googleJavaFormat` version to latest `1.16.0` -> `1.17.0`. ([#1710](https://github.com/diffplug/spotless/pull/1710))
1515
* Bump default `ktlint` version to latest `0.48.2` -> `0.49.1`.([#1696](https://github.com/diffplug/spotless/issues/1696))
1616
* Dropped support for `ktlint 0.46.x` following our policy of supporting two breaking changes at a time.
17+
* Bump default `sortpom` version to latest `3.0.0` -> `3.2.1`. ([#1675](https://github.com/diffplug/spotless/pull/1675))
1718

1819
## [2.36.0] - 2023-04-06
1920
### Added

0 commit comments

Comments
 (0)