Skip to content

Add support for Eclipse 4.28 #1775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Aug 29, 2023
Merged

Add support for Eclipse 4.28 #1775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b2db0f5
Add support for Eclipse 4.28
jochenberger Aug 2, 2023
74d840d
Update CHANGES.md
jochenberger Aug 3, 2023
effba12
Update CHANGES.md
jochenberger Aug 3, 2023
4c568b4
Update CHANGES.md
jochenberger Aug 3, 2023
d1c663a
Fix formatting
jochenberger Aug 3, 2023
4c48360
Fix formatting
jochenberger Aug 3, 2023
413cac8
Fix formatting
jochenberger Aug 3, 2023
14e4e62
Update default to 4.28
jochenberger Aug 4, 2023
130402a
Merge branch 'main' into patch-2
nedtwigg Aug 29, 2023
c23f89b
Update changelogs.
nedtwigg Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
### Changes
* Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
* Bump default `greclipse` version to latest `4.27` -> `4.28`. ([#1775](https://github.com/diffplug/spotless/pull/1775))

## [2.40.0] - 2023-07-17
### Added
Expand Down
6 changes: 4 additions & 2 deletions lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public final class GrEclipseFormatterStep {
private GrEclipseFormatterStep() {}

private static final String NAME = "eclipse groovy formatter";
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.27");
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(11, "4.26").add(17, "4.28");

public static String defaultVersion() {
return JVM_SUPPORT.getRecommendedFormatterVersion();
Expand All @@ -50,7 +50,9 @@ protected P2Model model(String version) {
throw new IllegalArgumentException("4.8 is the oldest version we support, this was " + version);
}
String greclipseVersion;
if (eVersion >= 18) {
if (eVersion >= 28) {
greclipseVersion = "5." + (eVersion - 28) + ".0";
Copy link
Contributor Author

@jochenberger jochenberger Aug 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, there's not really a 1:1 relation from Eclipse version to Groovy Plugin version. But pretending so seems to do the trick. ;-)

} else if (eVersion >= 18) {
greclipseVersion = "4." + (eVersion - 18) + ".0";
} else {
greclipseVersion = "3." + (eVersion - 8) + ".0";
Expand Down
1 change: 1 addition & 0 deletions plugin-gradle/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
### Changes
* Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
* Bump default `greclipse` version to latest `4.27` -> `4.28`. ([#1775](https://github.com/diffplug/spotless/pull/1775))

## [6.20.0] - 2023-07-17
### Added
Expand Down
1 change: 1 addition & 0 deletions plugin-maven/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
### Changes
* Bump default `eslint` version to latest `8.31.0` -> `8.45.0` ([#1761](https://github.com/diffplug/spotless/pull/1761))
* Bump default `prettier` version to latest (v2) `2.8.1` -> `2.8.8`. ([#1760](https://github.com/diffplug/spotless/pull/1760))
* Bump default `greclipse` version to latest `4.27` -> `4.28`. ([#1775](https://github.com/diffplug/spotless/pull/1775))

## [2.38.0] - 2023-07-17
### Added
Expand Down