Skip to content

Commit 85344bd

Browse files
nedtwiggnedtwigg
authored
Added Eclipse 4.21 support (#947)
2 parents a09a7b4 + 9f36088 commit 85344bd

File tree

12 files changed

+80
-6
lines changed

12 files changed

+80
-6
lines changed

‎CHANGES.md

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
1010
We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
1111

1212
## [Unreleased]
13+
### Changed
14+
* Added support and bump Eclipse formatter default versions to `4.21` for `eclipse-cdt`, `eclipse-jdt`, `eclipse-wtp`. Change is only applied for JVM 11+.
1315

1416
## [2.16.1] - 2021-09-20
1517
### Changed

‎lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ private EclipseCdtFormatterStep() {}
3838
private static final String NAME = "eclipse cdt formatter";
3939
private static final String FORMATTER_CLASS = "com.diffplug.spotless.extra.eclipse.cdt.EclipseCdtFormatterStepImpl";
4040
private static final String FORMATTER_METHOD = "format";
41-
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "4.16.0").add(11, "4.20.0");
41+
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "4.16.0").add(11, "4.21.0");
4242

4343
public static String defaultVersion() {
4444
return JVM_SUPPORT.getRecommendedFormatterVersion();

‎lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ private EclipseJdtFormatterStep() {}
3434
private static final String FORMATTER_CLASS = "com.diffplug.spotless.extra.eclipse.java.EclipseJdtFormatterStepImpl";
3535
private static final String MAVEN_GROUP_ARTIFACT = "com.diffplug.spotless:spotless-eclipse-jdt";
3636
private static final String FORMATTER_METHOD = "format";
37-
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "4.19.0").add(11, "4.20.0");
37+
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "4.19.0").add(11, "4.21.0");
3838

3939
public static String defaultVersion() {
4040
return JVM_SUPPORT.getRecommendedFormatterVersion();

‎lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public enum EclipseWtpFormatterStep {
3838

3939
private static final String NAME = "eclipse wtp formatters";
4040
private static final String FORMATTER_PACKAGE = "com.diffplug.spotless.extra.eclipse.wtp.";
41-
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "4.18.0").add(11, "4.20.0");
41+
private static final Jvm.Support<String> JVM_SUPPORT = Jvm.<String> support(NAME).add(8, "4.18.0").add(11, "4.21.0");
4242
private static final String FORMATTER_METHOD = "format";
4343

4444
private final String implementationClassName;

‎lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.21.0.lockfile

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Spotless formatter based on CDT version 10.4 (see https://www.eclipse.org/cdt/)
2+
com.diffplug.spotless:spotless-eclipse-cdt:10.4.0
3+
com.diffplug.spotless:spotless-eclipse-base:3.5.0
4+
com.github.spotbugs:spotbugs-annotations:4.0.2
5+
com.google.code.findbugs:jsr305:3.0.2
6+
com.ibm.icu:icu4j:67.1
7+
net.jcip:jcip-annotations:1.0
8+
org.eclipse.platform:org.eclipse.core.commands:3.10.100
9+
org.eclipse.platform:org.eclipse.core.contenttype:3.8.0
10+
org.eclipse.platform:org.eclipse.core.filebuffers:3.7.0
11+
org.eclipse.platform:org.eclipse.core.filesystem:1.9.100
12+
org.eclipse.platform:org.eclipse.core.jobs:3.12.0
13+
org.eclipse.platform:org.eclipse.core.resources:3.15.100
14+
org.eclipse.platform:org.eclipse.core.runtime:3.23.0
15+
org.eclipse.platform:org.eclipse.equinox.app:1.6.0
16+
org.eclipse.platform:org.eclipse.equinox.common:3.15.0
17+
org.eclipse.platform:org.eclipse.equinox.preferences:3.9.0
18+
org.eclipse.platform:org.eclipse.equinox.registry:3.11.0
19+
org.eclipse.platform:org.eclipse.jface.text:3.18.100
20+
org.eclipse.platform:org.eclipse.jface:3.23.0
21+
org.eclipse.platform:org.eclipse.osgi:3.17.0
22+
org.eclipse.platform:org.eclipse.text:3.12.0

‎lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.21.0.lockfile

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Spotless formatter based on JDT version 4.21.0 (see https://projects.eclipse.org/projects/eclipse.jdt)
2+
# Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/log/?h=R4_21 to determine core version.
3+
com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
4+
com.diffplug.spotless:spotless-eclipse-base:3.5.0
5+
com.github.spotbugs:spotbugs-annotations:4.0.2
6+
com.google.code.findbugs:jsr305:3.0.2
7+
net.jcip:jcip-annotations:1.0
8+
org.eclipse.jdt:org.eclipse.jdt.core:3.27.0
9+
org.eclipse.platform:org.eclipse.core.commands:3.10.100
10+
org.eclipse.platform:org.eclipse.core.contenttype:3.8.0
11+
org.eclipse.platform:org.eclipse.core.filesystem:1.9.100
12+
org.eclipse.platform:org.eclipse.core.jobs:3.12.0
13+
org.eclipse.platform:org.eclipse.core.resources:3.15.100
14+
org.eclipse.platform:org.eclipse.core.runtime:3.23.0
15+
org.eclipse.platform:org.eclipse.equinox.app:1.6.0
16+
org.eclipse.platform:org.eclipse.equinox.common:3.15.0
17+
org.eclipse.platform:org.eclipse.equinox.preferences:3.9.0
18+
org.eclipse.platform:org.eclipse.equinox.registry:3.11.0
19+
org.eclipse.platform:org.eclipse.osgi:3.17.0
20+
org.eclipse.platform:org.eclipse.text:3.12.0

‎lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatters/v4.21.0.lockfile

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Spotless formatter based on Eclipse-WTP version 3.23 (see https://www.eclipse.org/webtools/)
2+
com.diffplug.spotless:spotless-eclipse-wtp:3.23.0
3+
com.diffplug.spotless:spotless-eclipse-base:3.5.0
4+
com.github.spotbugs:spotbugs-annotations:4.0.2
5+
com.google.code.findbugs:jsr305:3.0.2
6+
com.ibm.icu:icu4j:67.1
7+
net.jcip:jcip-annotations:1.0
8+
org.eclipse.emf:org.eclipse.emf.common:2.23.0
9+
org.eclipse.emf:org.eclipse.emf.ecore:2.25.0
10+
org.eclipse.emf:org.eclipse.xsd:2.18.0
11+
org.eclipse.platform:org.eclipse.core.commands:3.10.100
12+
org.eclipse.platform:org.eclipse.core.contenttype:3.8.0
13+
org.eclipse.platform:org.eclipse.core.filebuffers:3.7.0
14+
org.eclipse.platform:org.eclipse.core.filesystem:1.9.100
15+
org.eclipse.platform:org.eclipse.core.jobs:3.12.0
16+
org.eclipse.platform:org.eclipse.core.resources:3.15.100
17+
org.eclipse.platform:org.eclipse.core.runtime:3.23.0
18+
org.eclipse.platform:org.eclipse.equinox.app:1.6.0
19+
org.eclipse.platform:org.eclipse.equinox.common:3.15.0
20+
org.eclipse.platform:org.eclipse.equinox.preferences:3.9.0
21+
org.eclipse.platform:org.eclipse.equinox.registry:3.11.0
22+
org.eclipse.platform:org.eclipse.jface.text:3.18.100
23+
org.eclipse.platform:org.eclipse.jface:3.23.0
24+
org.eclipse.platform:org.eclipse.osgi.services:3.10.200
25+
org.eclipse.platform:org.eclipse.osgi:3.17.0
26+
org.eclipse.platform:org.eclipse.text:3.12.0

‎lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class EclipseCdtFormatterStepTest extends EclipseCommonTests {
3131
protected String[] getSupportedVersions() {
3232
List<String> version = new ArrayList<String>();
3333
if (Jvm.version() >= 11) {
34-
version.addAll(Arrays.asList("4.17.0", "4.18.0", "4.19.0", "4.20.0"));
34+
version.addAll(Arrays.asList("4.17.0", "4.18.0", "4.19.0", "4.20.0", "4.21.0"));
3535
}
3636
version.addAll(Arrays.asList("4.7.3a", "4.11.0", "4.12.0", "4.13.0", "4.14.0", "4.16.0"));
3737
return version.toArray(new String[version.size()]);

‎lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class EclipseJdtFormatterStepTest extends EclipseCommonTests {
3131
protected String[] getSupportedVersions() {
3232
List<String> version = new ArrayList<String>();
3333
if (Jvm.version() >= 11) {
34-
version.add("4.20.0");
34+
version.addAll(Arrays.asList("4.20.0", "4.21.0"));
3535
}
3636
version.addAll(Arrays.asList("4.6.1", "4.6.2", "4.6.3", "4.7.0", "4.7.1", "4.7.2", "4.7.3a", "4.8.0", "4.9.0", "4.10.0",
3737
"4.11.0", "4.12.0", "4.13.0", "4.14.0", "4.15.0", "4.16.0", "4.17.0", "4.18.0", "4.19.0"));

‎lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterCommonTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ abstract class EclipseWtpFormatterCommonTests extends EclipseCommonTests {
4646
protected String[] getSupportedVersions() {
4747
List<String> version = new ArrayList<String>();
4848
if (Jvm.version() >= 11) {
49-
version.addAll(Arrays.asList("4.19.0", "4.20.0"));
49+
version.addAll(Arrays.asList("4.19.0", "4.20.0", "4.21.0"));
5050
}
5151
version.addAll(Arrays.asList("4.7.3a", "4.7.3b", "4.8.0", "4.12.0", "4.13.0", "4.14.0", "4.15.0",
5252
"4.16.0", "4.17.0", "4.18.0"));

‎plugin-gradle/CHANGES.md

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
44

55
## [Unreleased]
6+
### Changed
7+
* Added support and bump Eclipse formatter default versions to `4.21` for `eclipse-cdt`, `eclipse-jdt`, `eclipse-wtp`. Change is only applied for JVM 11+.
68

79
## [5.15.1] - 2021-09-20
810
### Changed

‎plugin-maven/CHANGES.md

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
44

55
## [Unreleased]
6+
### Changed
7+
* Added support and bump Eclipse formatter default versions to `4.21` for `eclipse-cdt`, `eclipse-jdt`, `eclipse-wtp`. Change is only applied for JVM 11+.
68

79
## [2.13.1] - 2021-09-20
810
### Changed

0 commit comments

Comments
 (0)