Skip to content

Commit c4eea16

Browse files
committed
Added missing Eclipse formatter support up to version 4.17.
1 parent 7169ecc commit c4eea16

25 files changed

+376
-37
lines changed

Diff for: _ext/eclipse-jdt/gradle.properties

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# Mayor/Minor versions correspond to the minimum Eclipse version supported/tested.
2-
# Patch version is incremented for backward compatible patches of this library.
31
artifactId=spotless-eclipse-jdt
42
description=Eclipse's JDT formatter bundled for Spotless
53

Diff for: lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ private EclipseCdtFormatterStep() {}
3636

3737
private static final String NAME = "eclipse cdt formatter";
3838
private static final String FORMATTER_CLASS = "com.diffplug.spotless.extra.eclipse.cdt.EclipseCdtFormatterStepImpl";
39-
private static final String DEFAULT_VERSION = "4.13.0";
39+
private static final String DEFAULT_VERSION = "4.16.0";
4040
private static final String FORMATTER_METHOD = "format";
4141

4242
public static String defaultVersion() {

Diff for: lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ private GrEclipseFormatterStep() {}
3333
private static final String FORMATTER_CLASS = "com.diffplug.spotless.extra.eclipse.groovy.GrEclipseFormatterStepImpl";
3434
private static final String FORMATTER_CLASS_OLD = "com.diffplug.gradle.spotless.groovy.eclipse.GrEclipseFormatterStepImpl";
3535
private static final String MAVEN_GROUP_ARTIFACT = "com.diffplug.spotless:spotless-eclipse-groovy";
36-
private static final String DEFAULT_VERSION = "4.13.0";
36+
private static final String DEFAULT_VERSION = "4.17.0";
3737
private static final String FORMATTER_METHOD = "format";
3838

3939
public static String defaultVersion() {

Diff for: lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ private EclipseJdtFormatterStep() {}
3232
private static final String FORMATTER_CLASS_OLD = "com.diffplug.gradle.spotless.java.eclipse.EclipseFormatterStepImpl";
3333
private static final String FORMATTER_CLASS = "com.diffplug.spotless.extra.eclipse.java.EclipseJdtFormatterStepImpl";
3434
private static final String MAVEN_GROUP_ARTIFACT = "com.diffplug.spotless:spotless-eclipse-jdt";
35-
private static final String DEFAULT_VERSION = "4.16.0";
35+
private static final String DEFAULT_VERSION = "4.17.0";
3636
private static final String FORMATTER_METHOD = "format";
3737

3838
public static String defaultVersion() {

Diff for: lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public enum EclipseWtpFormatterStep {
3636

3737
private static final String NAME = "eclipse wtp formatters";
3838
private static final String FORMATTER_PACKAGE = "com.diffplug.spotless.extra.eclipse.wtp.";
39-
private static final String DEFAULT_VERSION = "4.13.0";
39+
private static final String DEFAULT_VERSION = "4.17.0";
4040
private static final String FORMATTER_METHOD = "format";
4141

4242
private final String implementationClassName;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Spotless formatter based on CDT version 9.10.0 (see https://www.eclipse.org/cdt/)
2+
com.diffplug.spotless:spotless-eclipse-cdt:9.10.0
3+
com.diffplug.spotless:spotless-eclipse-base:3.3.0
4+
com.github.spotbugs:spotbugs-annotations:4.0.2
5+
com.google.code.findbugs:jsr305:3.0.2
6+
com.ibm.icu:icu4j:64.2
7+
net.jcip:jcip-annotations:1.0
8+
org.eclipse.platform:org.eclipse.core.commands:3.9.600
9+
org.eclipse.platform:org.eclipse.core.contenttype:3.7.500
10+
org.eclipse.platform:org.eclipse.core.filebuffers:3.6.800
11+
org.eclipse.platform:org.eclipse.core.filesystem:1.7.600
12+
org.eclipse.platform:org.eclipse.core.jobs:3.10.600
13+
org.eclipse.platform:org.eclipse.core.resources:3.13.600
14+
org.eclipse.platform:org.eclipse.core.runtime:3.17.0
15+
org.eclipse.platform:org.eclipse.equinox.app:1.4.300
16+
org.eclipse.platform:org.eclipse.equinox.common:3.10.600
17+
org.eclipse.platform:org.eclipse.equinox.preferences:3.7.600
18+
org.eclipse.platform:org.eclipse.equinox.registry:3.8.600
19+
org.eclipse.platform:org.eclipse.jface.text:3.16.100
20+
org.eclipse.platform:org.eclipse.jface:3.18.0
21+
org.eclipse.platform:org.eclipse.osgi:3.15.100
22+
org.eclipse.platform:org.eclipse.text:3.10.0
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Spotless formatter based on CDT version 9.11.1 (see https://www.eclipse.org/cdt/)
2+
com.diffplug.spotless:spotless-eclipse-cdt:9.11.0
3+
com.diffplug.spotless:spotless-eclipse-base:3.3.0
4+
com.github.spotbugs:spotbugs-annotations:4.0.2
5+
com.google.code.findbugs:jsr305:3.0.2
6+
com.google.j2objc:j2objc-annotations:1.3
7+
com.ibm.icu:icu4j:64.2
8+
org.eclipse.platform:org.eclipse.core.commands:3.9.700
9+
org.eclipse.platform:org.eclipse.core.contenttype:3.7.700
10+
org.eclipse.platform:org.eclipse.core.filebuffers:3.6.1000
11+
org.eclipse.platform:org.eclipse.core.filesystem:1.7.700
12+
org.eclipse.platform:org.eclipse.core.jobs:3.10.800
13+
org.eclipse.platform:org.eclipse.core.resources:3.13.700
14+
org.eclipse.platform:org.eclipse.core.runtime:3.18.0
15+
org.eclipse.platform:org.eclipse.equinox.app:1.4.500
16+
org.eclipse.platform:org.eclipse.equinox.common:3.12.0
17+
org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
18+
org.eclipse.platform:org.eclipse.equinox.registry:3.8.800
19+
org.eclipse.platform:org.eclipse.jface.text:3.16.300
20+
org.eclipse.platform:org.eclipse.jface:3.20.0
21+
org.eclipse.platform:org.eclipse.osgi:3.15.300
22+
org.eclipse.platform:org.eclipse.text:3.10.200
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Spotless formatter based on CDT version 10.0 (see https://www.eclipse.org/cdt/)
2+
com.diffplug.spotless:spotless-eclipse-cdt:10.0.0
3+
com.diffplug.spotless:spotless-eclipse-base:3.4.1
4+
com.github.spotbugs:spotbugs-annotations:4.0.2
5+
com.google.code.findbugs:jsr305:3.0.2
6+
com.ibm.icu:icu4j:64.2
7+
net.jcip:jcip-annotations:1.0
8+
org.eclipse.platform:org.eclipse.core.commands:3.9.700
9+
org.eclipse.platform:org.eclipse.core.contenttype:3.7.800
10+
org.eclipse.platform:org.eclipse.core.filebuffers:3.6.1000
11+
org.eclipse.platform:org.eclipse.core.filesystem:1.7.700
12+
org.eclipse.platform:org.eclipse.core.jobs:3.10.800
13+
org.eclipse.platform:org.eclipse.core.resources:3.13.800
14+
org.eclipse.platform:org.eclipse.core.runtime:3.19.0
15+
org.eclipse.platform:org.eclipse.equinox.app:1.5.0
16+
org.eclipse.platform:org.eclipse.equinox.common:3.13.0
17+
org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
18+
org.eclipse.platform:org.eclipse.equinox.registry:3.9.0
19+
org.eclipse.platform:org.eclipse.jface.text:3.16.400
20+
org.eclipse.platform:org.eclipse.jface:3.21.0
21+
org.eclipse.platform:org.eclipse.osgi:3.16.0
22+
org.eclipse.platform:org.eclipse.text:3.10.300
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Spotless formatter based on JDT version 4.17.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_17 to determine core version.
3+
com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
4+
com.diffplug.spotless:spotless-eclipse-base:3.4.1
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.23.0
9+
org.eclipse.platform:org.eclipse.core.commands:3.9.700
10+
org.eclipse.platform:org.eclipse.core.contenttype:3.7.800
11+
org.eclipse.platform:org.eclipse.core.jobs:3.10.800
12+
org.eclipse.platform:org.eclipse.core.resources:3.13.800
13+
org.eclipse.platform:org.eclipse.core.runtime:3.19.0
14+
org.eclipse.platform:org.eclipse.equinox.app:1.5.0
15+
org.eclipse.platform:org.eclipse.equinox.common:3.13.0
16+
org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
17+
org.eclipse.platform:org.eclipse.equinox.registry:3.9.0
18+
org.eclipse.platform:org.eclipse.osgi:3.16.0
19+
org.eclipse.platform:org.eclipse.text:3.10.300
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Spotless formatter based on Eclipse-WTP version 3.16 (see https://www.eclipse.org/webtools/)
2+
com.diffplug.spotless:spotless-eclipse-wtp:3.16.0
3+
com.diffplug.spotless:spotless-eclipse-base:3.3.0
4+
com.github.spotbugs:spotbugs-annotations:4.0.2
5+
com.google.code.findbugs:jsr305:3.0.2
6+
com.ibm.icu:icu4j:64.2
7+
org.eclipse.emf:org.eclipse.emf.common:2.17.0
8+
org.eclipse.emf:org.eclipse.emf.ecore:2.20.0
9+
org.eclipse.platform:org.eclipse.core.commands:3.9.600
10+
org.eclipse.platform:org.eclipse.core.contenttype:3.7.500
11+
org.eclipse.platform:org.eclipse.core.filebuffers:3.6.800
12+
org.eclipse.platform:org.eclipse.core.filesystem:1.7.600
13+
org.eclipse.platform:org.eclipse.core.jobs:3.10.600
14+
org.eclipse.platform:org.eclipse.core.resources:3.13.600
15+
org.eclipse.platform:org.eclipse.core.runtime:3.17.0
16+
org.eclipse.platform:org.eclipse.equinox.app:1.4.300
17+
org.eclipse.platform:org.eclipse.equinox.common:3.10.600
18+
org.eclipse.platform:org.eclipse.equinox.preferences:3.7.600
19+
org.eclipse.platform:org.eclipse.equinox.registry:3.8.600
20+
org.eclipse.platform:org.eclipse.jface.text:3.16.100
21+
org.eclipse.platform:org.eclipse.jface:3.18.0
22+
org.eclipse.platform:org.eclipse.osgi.services:3.8.0
23+
org.eclipse.platform:org.eclipse.osgi:3.15.100
24+
org.eclipse.platform:org.eclipse.text:3.10.0
25+
org.eclipse.xsd:org.eclipse.xsd:2.12.0
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Spotless formatter based on Eclipse-WTP version 3.17 (see https://www.eclipse.org/webtools/)
2+
com.diffplug.spotless:spotless-eclipse-wtp:3.17.0
3+
com.diffplug.spotless:spotless-eclipse-base:3.3.0
4+
com.github.spotbugs:spotbugs-annotations:4.0.2
5+
com.google.code.findbugs:jsr305:3.0.2
6+
com.ibm.icu:icu4j:64.2
7+
org.eclipse.emf:org.eclipse.emf.common:2.18.0
8+
org.eclipse.emf:org.eclipse.emf.ecore:2.21.0
9+
org.eclipse.emf:org.eclipse.xsd:2.17.0
10+
org.eclipse.platform:org.eclipse.core.commands:3.9.700
11+
org.eclipse.platform:org.eclipse.core.contenttype:3.7.600
12+
org.eclipse.platform:org.eclipse.core.filebuffers:3.6.900
13+
org.eclipse.platform:org.eclipse.core.filesystem:1.7.700
14+
org.eclipse.platform:org.eclipse.core.jobs:3.10.700
15+
org.eclipse.platform:org.eclipse.core.resources:3.13.700
16+
org.eclipse.platform:org.eclipse.core.runtime:3.17.100
17+
org.eclipse.platform:org.eclipse.equinox.app:1.4.400
18+
org.eclipse.platform:org.eclipse.equinox.common:3.11.0
19+
org.eclipse.platform:org.eclipse.equinox.preferences:3.7.700
20+
org.eclipse.platform:org.eclipse.equinox.registry:3.8.700
21+
org.eclipse.platform:org.eclipse.jface.text:3.16.200
22+
org.eclipse.platform:org.eclipse.jface:3.19.0
23+
org.eclipse.platform:org.eclipse.osgi.services:3.8.0
24+
org.eclipse.platform:org.eclipse.osgi:3.15.200
25+
org.eclipse.platform:org.eclipse.text:3.10.100
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Spotless formatter based on Eclipse-WTP version 3.18 (see https://www.eclipse.org/webtools/)
2+
com.diffplug.spotless:spotless-eclipse-wtp:3.18.0
3+
com.diffplug.spotless:spotless-eclipse-base:3.3.0
4+
com.github.spotbugs:spotbugs-annotations:4.0.2
5+
com.google.code.findbugs:jsr305:3.0.2
6+
com.ibm.icu:icu4j:64.2
7+
org.eclipse.emf:org.eclipse.emf.common:2.19.0
8+
org.eclipse.emf:org.eclipse.emf.ecore:2.22.0
9+
org.eclipse.emf:org.eclipse.xsd:2.17.0
10+
org.eclipse.platform:org.eclipse.core.commands:3.9.700
11+
org.eclipse.platform:org.eclipse.core.contenttype:3.7.700
12+
org.eclipse.platform:org.eclipse.core.filebuffers:3.6.1000
13+
org.eclipse.platform:org.eclipse.core.filesystem:1.7.700
14+
org.eclipse.platform:org.eclipse.core.jobs:3.10.800
15+
org.eclipse.platform:org.eclipse.core.resources:3.13.700
16+
org.eclipse.platform:org.eclipse.core.runtime:3.18.0
17+
org.eclipse.platform:org.eclipse.equinox.app:1.4.500
18+
org.eclipse.platform:org.eclipse.equinox.common:3.12.0
19+
org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
20+
org.eclipse.platform:org.eclipse.equinox.registry:3.8.800
21+
org.eclipse.platform:org.eclipse.jface.text:3.16.300
22+
org.eclipse.platform:org.eclipse.jface:3.20.0
23+
org.eclipse.platform:org.eclipse.osgi.services:3.8.0
24+
org.eclipse.platform:org.eclipse.osgi:3.15.300
25+
org.eclipse.platform:org.eclipse.text:3.10.200
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Spotless formatter based on Eclipse-WTP version 3.19 (see https://www.eclipse.org/webtools/)
2+
com.diffplug.spotless:spotless-eclipse-wtp:3.19.0
3+
com.diffplug.spotless:spotless-eclipse-base:3.4.1
4+
com.github.spotbugs:spotbugs-annotations:4.0.2
5+
com.google.code.findbugs:jsr305:3.0.2
6+
com.ibm.icu:icu4j:64.2
7+
net.jcip:jcip-annotations:1.0
8+
org.eclipse.emf:org.eclipse.emf.common:2.20.0
9+
org.eclipse.emf:org.eclipse.emf.ecore:2.23.0
10+
org.eclipse.emf:org.eclipse.xsd:2.18.0
11+
org.eclipse.platform:org.eclipse.core.commands:3.9.700
12+
org.eclipse.platform:org.eclipse.core.contenttype:3.7.800
13+
org.eclipse.platform:org.eclipse.core.filebuffers:3.6.1000
14+
org.eclipse.platform:org.eclipse.core.filesystem:1.7.700
15+
org.eclipse.platform:org.eclipse.core.jobs:3.10.800
16+
org.eclipse.platform:org.eclipse.core.resources:3.13.800
17+
org.eclipse.platform:org.eclipse.core.runtime:3.19.0
18+
org.eclipse.platform:org.eclipse.equinox.app:1.5.0
19+
org.eclipse.platform:org.eclipse.equinox.common:3.13.0
20+
org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
21+
org.eclipse.platform:org.eclipse.equinox.registry:3.9.0
22+
org.eclipse.platform:org.eclipse.jface.text:3.16.400
23+
org.eclipse.platform:org.eclipse.jface:3.21.0
24+
org.eclipse.platform:org.eclipse.osgi.services:3.9.0
25+
org.eclipse.platform:org.eclipse.osgi:3.16.0
26+
org.eclipse.platform:org.eclipse.text:3.10.300
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Spotless formatter based on Groovy-Eclipse version 3.6.0 (see https://github.com/groovy/groovy-eclipse/releases)
2+
com.diffplug.spotless:spotless-eclipse-groovy:3.6.0
3+
com.diffplug.spotless:spotless-eclipse-base:3.3.0
4+
com.github.spotbugs:spotbugs-annotations:4.0.2
5+
com.google.code.findbugs:jsr305:3.0.2
6+
org.eclipse.platform:org.eclipse.core.commands:3.9.600
7+
org.eclipse.platform:org.eclipse.core.contenttype:3.7.500
8+
org.eclipse.platform:org.eclipse.core.jobs:3.10.600
9+
org.eclipse.platform:org.eclipse.core.resources:3.13.600
10+
org.eclipse.platform:org.eclipse.core.runtime:3.17.0
11+
org.eclipse.platform:org.eclipse.equinox.app:1.4.300
12+
org.eclipse.platform:org.eclipse.equinox.common:3.10.600
13+
org.eclipse.platform:org.eclipse.equinox.preferences:3.7.600
14+
org.eclipse.platform:org.eclipse.equinox.registry:3.8.600
15+
org.eclipse.platform:org.eclipse.jface.text:3.16.100
16+
org.eclipse.platform:org.eclipse.jface:3.18.0
17+
org.eclipse.platform:org.eclipse.osgi:3.15.100
18+
org.eclipse.platform:org.eclipse.text:3.10.0
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Spotless formatter based on Groovy-Eclipse version 3.7.0 (see https://github.com/groovy/groovy-eclipse/releases)
2+
com.diffplug.spotless:spotless-eclipse-groovy:3.7.0
3+
com.diffplug.spotless:spotless-eclipse-base:3.3.0
4+
com.github.spotbugs:spotbugs-annotations:4.0.2
5+
com.google.code.findbugs:jsr305:3.0.2
6+
org.eclipse.platform:org.eclipse.core.commands:3.9.700
7+
org.eclipse.platform:org.eclipse.core.contenttype:3.7.600
8+
org.eclipse.platform:org.eclipse.core.jobs:3.10.700
9+
org.eclipse.platform:org.eclipse.core.resources:3.13.700
10+
org.eclipse.platform:org.eclipse.core.runtime:3.17.100
11+
org.eclipse.platform:org.eclipse.equinox.app:1.4.400
12+
org.eclipse.platform:org.eclipse.equinox.common:3.11.0
13+
org.eclipse.platform:org.eclipse.equinox.preferences:3.7.700
14+
org.eclipse.platform:org.eclipse.equinox.registry:3.8.700
15+
org.eclipse.platform:org.eclipse.jface.text:3.16.200
16+
org.eclipse.platform:org.eclipse.jface:3.19.0
17+
org.eclipse.platform:org.eclipse.osgi:3.15.200
18+
org.eclipse.platform:org.eclipse.text:3.10.100
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Spotless formatter based on Groovy-Eclipse version 3.8.0 (see https://github.com/groovy/groovy-eclipse/releases)
2+
com.diffplug.spotless:spotless-eclipse-groovy:3.8.0
3+
com.diffplug.spotless:spotless-eclipse-base:3.3.0
4+
com.github.spotbugs:spotbugs-annotations:4.0.2
5+
com.google.code.findbugs:jsr305:3.0.2
6+
org.eclipse.platform:org.eclipse.core.commands:3.9.700
7+
org.eclipse.platform:org.eclipse.core.contenttype:3.7.700
8+
org.eclipse.platform:org.eclipse.core.jobs:3.10.800
9+
org.eclipse.platform:org.eclipse.core.resources:3.13.700
10+
org.eclipse.platform:org.eclipse.core.runtime:3.18.0
11+
org.eclipse.platform:org.eclipse.equinox.app:1.4.500
12+
org.eclipse.platform:org.eclipse.equinox.common:3.12.0
13+
org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
14+
org.eclipse.platform:org.eclipse.equinox.registry:3.8.800
15+
org.eclipse.platform:org.eclipse.jface.text:3.16.300
16+
org.eclipse.platform:org.eclipse.jface:3.20.0
17+
org.eclipse.platform:org.eclipse.osgi:3.15.300
18+
org.eclipse.platform:org.eclipse.text:3.10.200
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Spotless formatter based on Groovy-Eclipse version 3.9.0 (see https://github.com/groovy/groovy-eclipse/releases)
2+
com.diffplug.spotless:spotless-eclipse-groovy:3.9.0
3+
com.diffplug.spotless:spotless-eclipse-base:3.4.1
4+
com.github.spotbugs:spotbugs-annotations:4.0.2
5+
com.google.code.findbugs:jsr305:3.0.2
6+
net.jcip:jcip-annotations:1.0
7+
org.eclipse.platform:org.eclipse.core.commands:3.9.700
8+
org.eclipse.platform:org.eclipse.core.contenttype:3.7.800
9+
org.eclipse.platform:org.eclipse.core.jobs:3.10.800
10+
org.eclipse.platform:org.eclipse.core.resources:3.13.800
11+
org.eclipse.platform:org.eclipse.core.runtime:3.19.0
12+
org.eclipse.platform:org.eclipse.equinox.app:1.5.0
13+
org.eclipse.platform:org.eclipse.equinox.common:3.13.0
14+
org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
15+
org.eclipse.platform:org.eclipse.equinox.registry:3.9.0
16+
org.eclipse.platform:org.eclipse.jface.text:3.16.400
17+
org.eclipse.platform:org.eclipse.jface:3.21.0
18+
org.eclipse.platform:org.eclipse.osgi:3.16.0
19+
org.eclipse.platform:org.eclipse.text:3.10.300
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* Copyright 2016-2020 DiffPlug
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package com.diffplug.spotless.extra.cpp;
17+
18+
/** Older versions of CDT support Java 8 or higher */
19+
public class EclipseCdtFormatterStepOldTest extends EclipseCdtFormatterStepTest {
20+
21+
@Override
22+
protected String[] getSupportedVersions() {
23+
return new String[]{"4.7.3a", "4.11.0", "4.12.0", "4.13.0", "4.14.0", "4.16.0"};
24+
}
25+
26+
@Override
27+
protected void makeAssumptions() {
28+
}
29+
30+
}

Diff for: lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016 DiffPlug
2+
* Copyright 2016-2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
1616
package com.diffplug.spotless.extra.cpp;
1717

1818
import com.diffplug.spotless.FormatterStep;
19+
import com.diffplug.spotless.JreVersion;
1920
import com.diffplug.spotless.TestProvisioner;
2021
import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
2122
import com.diffplug.spotless.extra.eclipse.EclipseCommonTests;
@@ -24,7 +25,12 @@ public class EclipseCdtFormatterStepTest extends EclipseCommonTests {
2425

2526
@Override
2627
protected String[] getSupportedVersions() {
27-
return new String[]{"4.7.3a", "4.11.0", "4.12.0", "4.13.0"};
28+
return new String[]{"4.17.0"};
29+
}
30+
31+
@Override
32+
protected void makeAssumptions() {
33+
JreVersion.assume11OrGreater();
2834
}
2935

3036
@Override

0 commit comments

Comments
 (0)