Skip to content

Commit 7d4fa6a

Browse files
Cirrasfourls
authored andcommitted
Upgrade google-java-format to 1.26.0
This also bumps our minimum JDK requirement to 17, as it's a requirement starting from google-java-format 1.25.0.
1 parent 9c0bd72 commit 7d4fa6a

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

.github/workflows/format.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ jobs:
2020
- uses: actions/checkout@v4
2121
- uses: axel-op/googlejavaformat-action@c1134ebd196c4cbffb077f9476585b0be8b6afcd # v4.0.0
2222
with:
23-
release-name: v1.19.2
23+
release-name: v1.26.0
2424
args: "--set-exit-if-changed --dry-run"

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ read the [contributing guide](docs/CONTRIBUTING.md).
104104

105105
## Development
106106

107-
SonarDelphi can be built with JDK 11+ using [Maven](https://maven.apache.org/).
107+
SonarDelphi can be built with JDK 17+ using [Maven](https://maven.apache.org/).
108108

109109
To build the project and run unit tests, execute the following command from the project's root directory:
110110

delphi-frontend/src/main/java/au/com/integradev/delphi/msbuild/condition/BinaryExpression.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,11 @@ public Optional<Boolean> boolEvaluate(ExpressionEvaluator evaluator) {
4545
return isEqual(evaluator);
4646
case NOT_EQUAL:
4747
return isEqual(evaluator).map(value -> !value);
48-
// NOTE:
49-
// When comparing numerics against versions, if the number is the same as the "major"
50-
// version,
51-
// then that means we are comparing something like "6.X.Y.Z" to "6".
52-
// Version treats the objects with more dots as "larger" regardless of what those dots are
53-
// (e.g. 6.0.0.0 > 6 is a true statement)
48+
// NOTE:
49+
// When comparing numerics against versions, if the number is the same as the "major" version,
50+
// then that means we are comparing something like "6.X.Y.Z" to "6".
51+
// Version treats the objects with more dots as "larger" regardless of what those dots are
52+
// (e.g. 6.0.0.0 > 6 is a true statement)
5453
case GREATER_THAN:
5554
return compare(
5655
evaluator,

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
<properties>
104104
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
105105
<maven.min.version>3.3.9</maven.min.version>
106-
<jdk.min.version>11</jdk.min.version>
106+
<jdk.min.version>17</jdk.min.version>
107107
<skipITs>true</skipITs>
108108
<!-- SonarCloud scan -->
109109
<sonar.organization>integrated-application-development</sonar.organization>
@@ -463,7 +463,7 @@
463463
<configuration>
464464
<java>
465465
<googleJavaFormat>
466-
<version>1.19.2</version>
466+
<version>1.26.0</version>
467467
<style>GOOGLE</style>
468468
<reflowLongStrings>true</reflowLongStrings>
469469
</googleJavaFormat>

0 commit comments

Comments
 (0)