Skip to content

Commit cd7f4de

Browse files
authored
Update dependency com.google.googlejavaformat:google-java-format to v1.22.0 (#2129)
2 parents f2c85db + 5864acc commit cd7f4de

File tree

6 files changed

+7
-3
lines changed

6 files changed

+7
-3
lines changed

Diff for: CHANGES.md

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
2020
* scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
2121
### Changes
2222
* Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
23+
* Bump default `google-java-format` version to latest `1.19.2` -> `1.22.0`. ([#2129](https://github.com/diffplug/spotless/pull/2129))
2324
* Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
2425
* Bump default `ktfmt` version to latest `0.46` -> `0.49`. ([#2045](https://github.com/diffplug/spotless/pull/2045), [#2127](https://github.com/diffplug/spotless/pull/2127))
2526
* Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))

Diff for: lib/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ dependencies {
9393
gherkinCompileOnly 'io.cucumber:gherkin-utils:9.0.0'
9494
gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.0'
9595
// googleJavaFormat
96-
googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.19.2'
96+
googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.22.0'
9797
// gson
9898
gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
9999
// jackson

Diff for: lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ private static FormatterStep createInternally(String groupArtifact, String versi
121121
.addMin(11, "1.8") // we only support google-java-format >= 1.8 due to api changes
122122
.addMin(16, "1.10.0") // java 16 requires at least 1.10.0 due to jdk api changes in JavaTokenizer
123123
.addMin(21, "1.17.0") // java 21 requires at least 1.17.0 due to https://github.com/google/google-java-format/issues/898
124-
.add(11, "1.19.2"); // default version
124+
.add(11, "1.22.0"); // default version
125125

126126
public static String defaultGroupArtifact() {
127127
return MAVEN_COORDINATE;

Diff for: plugin-gradle/CHANGES.md

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
1515
* scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
1616
### Changes
1717
* Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
18+
* Bump default `google-java-format` version to latest `1.19.2` -> `1.22.0`. ([#2129](https://github.com/diffplug/spotless/pull/2129))
1819
* Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
1920
* Bump default `ktfmt` version to latest `0.46` -> `0.49`. ([#2045](https://github.com/diffplug/spotless/pull/2045), [#2127](https://github.com/diffplug/spotless/pull/2127))
2021
* Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))

Diff for: plugin-maven/CHANGES.md

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
1313
* scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
1414
### Changes
1515
* Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
16+
* Bump default `google-java-format` version to latest `1.19.2` -> `1.22.0`. ([#2129](https://github.com/diffplug/spotless/pull/2129))
1617
* Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
1718
* Bump default `ktfmt` version to latest `0.46` -> `0.49`. ([#2045](https://github.com/diffplug/spotless/pull/2045), [#2127](https://github.com/diffplug/spotless/pull/2127))
1819
* Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))

Diff for: testlib/src/main/resources/java/googlejavaformat/TextBlock.clean

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import mylib.UsedB;
33

44
public class Java {
55
public static void main(String[] args) {
6-
var a = """
6+
var a =
7+
"""
78
Howdy
89
Partner!
910
""";

0 commit comments

Comments
 (0)