diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index d9108a3ed..1884871d0 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -20,5 +20,5 @@ jobs: - uses: actions/checkout@v4 - uses: axel-op/googlejavaformat-action@c1134ebd196c4cbffb077f9476585b0be8b6afcd # v4.0.0 with: - release-name: v1.19.2 + release-name: v1.26.0 args: "--set-exit-if-changed --dry-run" diff --git a/README.md b/README.md index 0047861da..d2d70d130 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ read the [contributing guide](docs/CONTRIBUTING.md). ## Development -SonarDelphi can be built with JDK 11+ using [Maven](https://maven.apache.org/). +SonarDelphi can be built with JDK 17+ using [Maven](https://maven.apache.org/). To build the project and run unit tests, execute the following command from the project's root directory: diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/msbuild/condition/BinaryExpression.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/msbuild/condition/BinaryExpression.java index c7fff8982..d2816a0dc 100644 --- a/delphi-frontend/src/main/java/au/com/integradev/delphi/msbuild/condition/BinaryExpression.java +++ b/delphi-frontend/src/main/java/au/com/integradev/delphi/msbuild/condition/BinaryExpression.java @@ -45,12 +45,11 @@ public Optional boolEvaluate(ExpressionEvaluator evaluator) { return isEqual(evaluator); case NOT_EQUAL: return isEqual(evaluator).map(value -> !value); - // NOTE: - // When comparing numerics against versions, if the number is the same as the "major" - // version, - // then that means we are comparing something like "6.X.Y.Z" to "6". - // Version treats the objects with more dots as "larger" regardless of what those dots are - // (e.g. 6.0.0.0 > 6 is a true statement) + // NOTE: + // When comparing numerics against versions, if the number is the same as the "major" version, + // then that means we are comparing something like "6.X.Y.Z" to "6". + // Version treats the objects with more dots as "larger" regardless of what those dots are + // (e.g. 6.0.0.0 > 6 is a true statement) case GREATER_THAN: return compare( evaluator, diff --git a/pom.xml b/pom.xml index 001866de8..665278bfb 100644 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,7 @@ UTF-8 3.3.9 - 11 + 17 true integrated-application-development @@ -463,7 +463,7 @@ - 1.19.2 + 1.26.0 true