Skip to content

Commit

Permalink
Added missing Eclipse formatter support up to version 4.17.
Browse files Browse the repository at this point in the history
  • Loading branch information
fvgh committed Oct 18, 2020
1 parent 7169ecc commit 2d02701
Show file tree
Hide file tree
Showing 25 changed files with 375 additions and 37 deletions.
2 changes: 0 additions & 2 deletions _ext/eclipse-jdt/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Mayor/Minor versions correspond to the minimum Eclipse version supported/tested.
# Patch version is incremented for backward compatible patches of this library.
artifactId=spotless-eclipse-jdt
description=Eclipse's JDT formatter bundled for Spotless

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ private EclipseCdtFormatterStep() {}

private static final String NAME = "eclipse cdt formatter";
private static final String FORMATTER_CLASS = "com.diffplug.spotless.extra.eclipse.cdt.EclipseCdtFormatterStepImpl";
private static final String DEFAULT_VERSION = "4.13.0";
private static final String DEFAULT_VERSION = "4.16.0";
private static final String FORMATTER_METHOD = "format";

public static String defaultVersion() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ private GrEclipseFormatterStep() {}
private static final String FORMATTER_CLASS = "com.diffplug.spotless.extra.eclipse.groovy.GrEclipseFormatterStepImpl";
private static final String FORMATTER_CLASS_OLD = "com.diffplug.gradle.spotless.groovy.eclipse.GrEclipseFormatterStepImpl";
private static final String MAVEN_GROUP_ARTIFACT = "com.diffplug.spotless:spotless-eclipse-groovy";
private static final String DEFAULT_VERSION = "4.13.0";
private static final String DEFAULT_VERSION = "4.17.0";
private static final String FORMATTER_METHOD = "format";

public static String defaultVersion() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ private EclipseJdtFormatterStep() {}
private static final String FORMATTER_CLASS_OLD = "com.diffplug.gradle.spotless.java.eclipse.EclipseFormatterStepImpl";
private static final String FORMATTER_CLASS = "com.diffplug.spotless.extra.eclipse.java.EclipseJdtFormatterStepImpl";
private static final String MAVEN_GROUP_ARTIFACT = "com.diffplug.spotless:spotless-eclipse-jdt";
private static final String DEFAULT_VERSION = "4.16.0";
private static final String DEFAULT_VERSION = "4.17.0";
private static final String FORMATTER_METHOD = "format";

public static String defaultVersion() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public enum EclipseWtpFormatterStep {

private static final String NAME = "eclipse wtp formatters";
private static final String FORMATTER_PACKAGE = "com.diffplug.spotless.extra.eclipse.wtp.";
private static final String DEFAULT_VERSION = "4.13.0";
private static final String DEFAULT_VERSION = "4.17.0";
private static final String FORMATTER_METHOD = "format";

private final String implementationClassName;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Spotless formatter based on CDT version 9.10.0 (see https://www.eclipse.org/cdt/)
com.diffplug.spotless:spotless-eclipse-cdt:9.10.0
com.diffplug.spotless:spotless-eclipse-base:3.3.0
com.github.spotbugs:spotbugs-annotations:4.0.2
com.google.code.findbugs:jsr305:3.0.2
com.ibm.icu:icu4j:64.2
net.jcip:jcip-annotations:1.0
org.eclipse.platform:org.eclipse.core.commands:3.9.600
org.eclipse.platform:org.eclipse.core.contenttype:3.7.500
org.eclipse.platform:org.eclipse.core.filebuffers:3.6.800
org.eclipse.platform:org.eclipse.core.filesystem:1.7.600
org.eclipse.platform:org.eclipse.core.jobs:3.10.600
org.eclipse.platform:org.eclipse.core.resources:3.13.600
org.eclipse.platform:org.eclipse.core.runtime:3.17.0
org.eclipse.platform:org.eclipse.equinox.app:1.4.300
org.eclipse.platform:org.eclipse.equinox.common:3.10.600
org.eclipse.platform:org.eclipse.equinox.preferences:3.7.600
org.eclipse.platform:org.eclipse.equinox.registry:3.8.600
org.eclipse.platform:org.eclipse.jface.text:3.16.100
org.eclipse.platform:org.eclipse.jface:3.18.0
org.eclipse.platform:org.eclipse.osgi:3.15.100
org.eclipse.platform:org.eclipse.text:3.10.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Spotless formatter based on CDT version 9.11.1 (see https://www.eclipse.org/cdt/)
com.diffplug.spotless:spotless-eclipse-cdt:9.11.0
com.diffplug.spotless:spotless-eclipse-base:3.3.0
com.github.spotbugs:spotbugs-annotations:4.0.2
com.google.code.findbugs:jsr305:3.0.2
com.google.j2objc:j2objc-annotations:1.3
com.ibm.icu:icu4j:64.2
org.eclipse.platform:org.eclipse.core.commands:3.9.700
org.eclipse.platform:org.eclipse.core.contenttype:3.7.700
org.eclipse.platform:org.eclipse.core.filebuffers:3.6.1000
org.eclipse.platform:org.eclipse.core.filesystem:1.7.700
org.eclipse.platform:org.eclipse.core.jobs:3.10.800
org.eclipse.platform:org.eclipse.core.resources:3.13.700
org.eclipse.platform:org.eclipse.core.runtime:3.18.0
org.eclipse.platform:org.eclipse.equinox.app:1.4.500
org.eclipse.platform:org.eclipse.equinox.common:3.12.0
org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
org.eclipse.platform:org.eclipse.equinox.registry:3.8.800
org.eclipse.platform:org.eclipse.jface.text:3.16.300
org.eclipse.platform:org.eclipse.jface:3.20.0
org.eclipse.platform:org.eclipse.osgi:3.15.300
org.eclipse.platform:org.eclipse.text:3.10.200
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Spotless formatter based on CDT version 10.0 (see https://www.eclipse.org/cdt/)
com.diffplug.spotless:spotless-eclipse-cdt:10.0.0
com.diffplug.spotless:spotless-eclipse-base:3.4.1
com.github.spotbugs:spotbugs-annotations:4.0.2
com.google.code.findbugs:jsr305:3.0.2
com.ibm.icu:icu4j:64.2
net.jcip:jcip-annotations:1.0
org.eclipse.platform:org.eclipse.core.commands:3.9.700
org.eclipse.platform:org.eclipse.core.contenttype:3.7.800
org.eclipse.platform:org.eclipse.core.filebuffers:3.6.1000
org.eclipse.platform:org.eclipse.core.filesystem:1.7.700
org.eclipse.platform:org.eclipse.core.jobs:3.10.800
org.eclipse.platform:org.eclipse.core.resources:3.13.800
org.eclipse.platform:org.eclipse.core.runtime:3.19.0
org.eclipse.platform:org.eclipse.equinox.app:1.5.0
org.eclipse.platform:org.eclipse.equinox.common:3.13.0
org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
org.eclipse.platform:org.eclipse.equinox.registry:3.9.0
org.eclipse.platform:org.eclipse.jface.text:3.16.400
org.eclipse.platform:org.eclipse.jface:3.21.0
org.eclipse.platform:org.eclipse.osgi:3.16.0
org.eclipse.platform:org.eclipse.text:3.10.300
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Spotless formatter based on JDT version 4.17.0 (see https://projects.eclipse.org/projects/eclipse.jdt)
# Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/log/?h=R4_17 to determine core version.
com.diffplug.spotless:spotless-eclipse-jdt:4.8.0
com.diffplug.spotless:spotless-eclipse-base:3.4.1
com.github.spotbugs:spotbugs-annotations:4.0.2
com.google.code.findbugs:jsr305:3.0.2
net.jcip:jcip-annotations:1.0
org.eclipse.jdt:org.eclipse.jdt.core:3.23.0
org.eclipse.platform:org.eclipse.core.commands:3.9.700
org.eclipse.platform:org.eclipse.core.contenttype:3.7.800
org.eclipse.platform:org.eclipse.core.jobs:3.10.800
org.eclipse.platform:org.eclipse.core.resources:3.13.800
org.eclipse.platform:org.eclipse.core.runtime:3.19.0
org.eclipse.platform:org.eclipse.equinox.app:1.5.0
org.eclipse.platform:org.eclipse.equinox.common:3.13.0
org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
org.eclipse.platform:org.eclipse.equinox.registry:3.9.0
org.eclipse.platform:org.eclipse.osgi:3.16.0
org.eclipse.platform:org.eclipse.text:3.10.300
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Spotless formatter based on Eclipse-WTP version 3.16 (see https://www.eclipse.org/webtools/)
com.diffplug.spotless:spotless-eclipse-wtp:3.16.0
com.diffplug.spotless:spotless-eclipse-base:3.3.0
com.github.spotbugs:spotbugs-annotations:4.0.2
com.google.code.findbugs:jsr305:3.0.2
com.ibm.icu:icu4j:64.2
org.eclipse.emf:org.eclipse.emf.common:2.17.0
org.eclipse.emf:org.eclipse.emf.ecore:2.20.0
org.eclipse.platform:org.eclipse.core.commands:3.9.600
org.eclipse.platform:org.eclipse.core.contenttype:3.7.500
org.eclipse.platform:org.eclipse.core.filebuffers:3.6.800
org.eclipse.platform:org.eclipse.core.filesystem:1.7.600
org.eclipse.platform:org.eclipse.core.jobs:3.10.600
org.eclipse.platform:org.eclipse.core.resources:3.13.600
org.eclipse.platform:org.eclipse.core.runtime:3.17.0
org.eclipse.platform:org.eclipse.equinox.app:1.4.300
org.eclipse.platform:org.eclipse.equinox.common:3.10.600
org.eclipse.platform:org.eclipse.equinox.preferences:3.7.600
org.eclipse.platform:org.eclipse.equinox.registry:3.8.600
org.eclipse.platform:org.eclipse.jface.text:3.16.100
org.eclipse.platform:org.eclipse.jface:3.18.0
org.eclipse.platform:org.eclipse.osgi.services:3.8.0
org.eclipse.platform:org.eclipse.osgi:3.15.100
org.eclipse.platform:org.eclipse.text:3.10.0
org.eclipse.xsd:org.eclipse.xsd:2.12.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Spotless formatter based on Eclipse-WTP version 3.17 (see https://www.eclipse.org/webtools/)
com.diffplug.spotless:spotless-eclipse-wtp:3.17.0
com.diffplug.spotless:spotless-eclipse-base:3.3.0
com.github.spotbugs:spotbugs-annotations:4.0.2
com.google.code.findbugs:jsr305:3.0.2
com.ibm.icu:icu4j:64.2
org.eclipse.emf:org.eclipse.emf.common:2.18.0
org.eclipse.emf:org.eclipse.emf.ecore:2.21.0
org.eclipse.emf:org.eclipse.xsd:2.17.0
org.eclipse.platform:org.eclipse.core.commands:3.9.700
org.eclipse.platform:org.eclipse.core.contenttype:3.7.600
org.eclipse.platform:org.eclipse.core.filebuffers:3.6.900
org.eclipse.platform:org.eclipse.core.filesystem:1.7.700
org.eclipse.platform:org.eclipse.core.jobs:3.10.700
org.eclipse.platform:org.eclipse.core.resources:3.13.700
org.eclipse.platform:org.eclipse.core.runtime:3.17.100
org.eclipse.platform:org.eclipse.equinox.app:1.4.400
org.eclipse.platform:org.eclipse.equinox.common:3.11.0
org.eclipse.platform:org.eclipse.equinox.preferences:3.7.700
org.eclipse.platform:org.eclipse.equinox.registry:3.8.700
org.eclipse.platform:org.eclipse.jface.text:3.16.200
org.eclipse.platform:org.eclipse.jface:3.19.0
org.eclipse.platform:org.eclipse.osgi.services:3.8.0
org.eclipse.platform:org.eclipse.osgi:3.15.200
org.eclipse.platform:org.eclipse.text:3.10.100
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Spotless formatter based on Eclipse-WTP version 3.18 (see https://www.eclipse.org/webtools/)
com.diffplug.spotless:spotless-eclipse-wtp:3.18.0
com.diffplug.spotless:spotless-eclipse-base:3.3.0
com.github.spotbugs:spotbugs-annotations:4.0.2
com.google.code.findbugs:jsr305:3.0.2
com.ibm.icu:icu4j:64.2
org.eclipse.emf:org.eclipse.emf.common:2.19.0
org.eclipse.emf:org.eclipse.emf.ecore:2.22.0
org.eclipse.emf:org.eclipse.xsd:2.17.0
org.eclipse.platform:org.eclipse.core.commands:3.9.700
org.eclipse.platform:org.eclipse.core.contenttype:3.7.700
org.eclipse.platform:org.eclipse.core.filebuffers:3.6.1000
org.eclipse.platform:org.eclipse.core.filesystem:1.7.700
org.eclipse.platform:org.eclipse.core.jobs:3.10.800
org.eclipse.platform:org.eclipse.core.resources:3.13.700
org.eclipse.platform:org.eclipse.core.runtime:3.18.0
org.eclipse.platform:org.eclipse.equinox.app:1.4.500
org.eclipse.platform:org.eclipse.equinox.common:3.12.0
org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
org.eclipse.platform:org.eclipse.equinox.registry:3.8.800
org.eclipse.platform:org.eclipse.jface.text:3.16.300
org.eclipse.platform:org.eclipse.jface:3.20.0
org.eclipse.platform:org.eclipse.osgi.services:3.8.0
org.eclipse.platform:org.eclipse.osgi:3.15.300
org.eclipse.platform:org.eclipse.text:3.10.200
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Spotless formatter based on Eclipse-WTP version 3.19 (see https://www.eclipse.org/webtools/)
com.diffplug.spotless:spotless-eclipse-wtp:3.19.0
com.diffplug.spotless:spotless-eclipse-base:3.4.1
com.github.spotbugs:spotbugs-annotations:4.0.2
com.google.code.findbugs:jsr305:3.0.2
com.ibm.icu:icu4j:64.2
net.jcip:jcip-annotations:1.0
org.eclipse.emf:org.eclipse.emf.common:2.20.0
org.eclipse.emf:org.eclipse.emf.ecore:2.23.0
org.eclipse.emf:org.eclipse.xsd:2.18.0
org.eclipse.platform:org.eclipse.core.commands:3.9.700
org.eclipse.platform:org.eclipse.core.contenttype:3.7.800
org.eclipse.platform:org.eclipse.core.filebuffers:3.6.1000
org.eclipse.platform:org.eclipse.core.filesystem:1.7.700
org.eclipse.platform:org.eclipse.core.jobs:3.10.800
org.eclipse.platform:org.eclipse.core.resources:3.13.800
org.eclipse.platform:org.eclipse.core.runtime:3.19.0
org.eclipse.platform:org.eclipse.equinox.app:1.5.0
org.eclipse.platform:org.eclipse.equinox.common:3.13.0
org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
org.eclipse.platform:org.eclipse.equinox.registry:3.9.0
org.eclipse.platform:org.eclipse.jface.text:3.16.400
org.eclipse.platform:org.eclipse.jface:3.21.0
org.eclipse.platform:org.eclipse.osgi.services:3.9.0
org.eclipse.platform:org.eclipse.osgi:3.16.0
org.eclipse.platform:org.eclipse.text:3.10.300
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Spotless formatter based on Groovy-Eclipse version 3.6.0 (see https://github.com/groovy/groovy-eclipse/releases)
com.diffplug.spotless:spotless-eclipse-groovy:3.6.0
com.diffplug.spotless:spotless-eclipse-base:3.3.0
com.github.spotbugs:spotbugs-annotations:4.0.2
com.google.code.findbugs:jsr305:3.0.2
org.eclipse.platform:org.eclipse.core.commands:3.9.600
org.eclipse.platform:org.eclipse.core.contenttype:3.7.500
org.eclipse.platform:org.eclipse.core.jobs:3.10.600
org.eclipse.platform:org.eclipse.core.resources:3.13.600
org.eclipse.platform:org.eclipse.core.runtime:3.17.0
org.eclipse.platform:org.eclipse.equinox.app:1.4.300
org.eclipse.platform:org.eclipse.equinox.common:3.10.600
org.eclipse.platform:org.eclipse.equinox.preferences:3.7.600
org.eclipse.platform:org.eclipse.equinox.registry:3.8.600
org.eclipse.platform:org.eclipse.jface.text:3.16.100
org.eclipse.platform:org.eclipse.jface:3.18.0
org.eclipse.platform:org.eclipse.osgi:3.15.100
org.eclipse.platform:org.eclipse.text:3.10.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Spotless formatter based on Groovy-Eclipse version 3.7.0 (see https://github.com/groovy/groovy-eclipse/releases)
com.diffplug.spotless:spotless-eclipse-groovy:3.7.0
com.diffplug.spotless:spotless-eclipse-base:3.3.0
com.github.spotbugs:spotbugs-annotations:4.0.2
com.google.code.findbugs:jsr305:3.0.2
org.eclipse.platform:org.eclipse.core.commands:3.9.700
org.eclipse.platform:org.eclipse.core.contenttype:3.7.600
org.eclipse.platform:org.eclipse.core.jobs:3.10.700
org.eclipse.platform:org.eclipse.core.resources:3.13.700
org.eclipse.platform:org.eclipse.core.runtime:3.17.100
org.eclipse.platform:org.eclipse.equinox.app:1.4.400
org.eclipse.platform:org.eclipse.equinox.common:3.11.0
org.eclipse.platform:org.eclipse.equinox.preferences:3.7.700
org.eclipse.platform:org.eclipse.equinox.registry:3.8.700
org.eclipse.platform:org.eclipse.jface.text:3.16.200
org.eclipse.platform:org.eclipse.jface:3.19.0
org.eclipse.platform:org.eclipse.osgi:3.15.200
org.eclipse.platform:org.eclipse.text:3.10.100
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Spotless formatter based on Groovy-Eclipse version 3.8.0 (see https://github.com/groovy/groovy-eclipse/releases)
com.diffplug.spotless:spotless-eclipse-groovy:3.8.0
com.diffplug.spotless:spotless-eclipse-base:3.3.0
com.github.spotbugs:spotbugs-annotations:4.0.2
com.google.code.findbugs:jsr305:3.0.2
org.eclipse.platform:org.eclipse.core.commands:3.9.700
org.eclipse.platform:org.eclipse.core.contenttype:3.7.700
org.eclipse.platform:org.eclipse.core.jobs:3.10.800
org.eclipse.platform:org.eclipse.core.resources:3.13.700
org.eclipse.platform:org.eclipse.core.runtime:3.18.0
org.eclipse.platform:org.eclipse.equinox.app:1.4.500
org.eclipse.platform:org.eclipse.equinox.common:3.12.0
org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
org.eclipse.platform:org.eclipse.equinox.registry:3.8.800
org.eclipse.platform:org.eclipse.jface.text:3.16.300
org.eclipse.platform:org.eclipse.jface:3.20.0
org.eclipse.platform:org.eclipse.osgi:3.15.300
org.eclipse.platform:org.eclipse.text:3.10.200
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Spotless formatter based on Groovy-Eclipse version 3.9.0 (see https://github.com/groovy/groovy-eclipse/releases)
com.diffplug.spotless:spotless-eclipse-groovy:3.9.0
com.diffplug.spotless:spotless-eclipse-base:3.4.1
com.github.spotbugs:spotbugs-annotations:4.0.2
com.google.code.findbugs:jsr305:3.0.2
net.jcip:jcip-annotations:1.0
org.eclipse.platform:org.eclipse.core.commands:3.9.700
org.eclipse.platform:org.eclipse.core.contenttype:3.7.800
org.eclipse.platform:org.eclipse.core.jobs:3.10.800
org.eclipse.platform:org.eclipse.core.resources:3.13.800
org.eclipse.platform:org.eclipse.core.runtime:3.19.0
org.eclipse.platform:org.eclipse.equinox.app:1.5.0
org.eclipse.platform:org.eclipse.equinox.common:3.13.0
org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0
org.eclipse.platform:org.eclipse.equinox.registry:3.9.0
org.eclipse.platform:org.eclipse.jface.text:3.16.400
org.eclipse.platform:org.eclipse.jface:3.21.0
org.eclipse.platform:org.eclipse.osgi:3.16.0
org.eclipse.platform:org.eclipse.text:3.10.300
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/*
* Copyright 2016-2020 DiffPlug
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.diffplug.spotless.extra.cpp;

/** Older versions of CDT support Java 8 or higher */
public class EclipseCdtFormatterStepOldTest extends EclipseCdtFormatterStepTest {

@Override
protected String[] getSupportedVersions() {
return new String[]{"4.7.3a", "4.11.0", "4.12.0", "4.13.0", "4.14.0", "4.16.0"};
}

@Override
protected void makeAssumptions() {}

}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016 DiffPlug
* Copyright 2016-2020 DiffPlug
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -16,6 +16,7 @@
package com.diffplug.spotless.extra.cpp;

import com.diffplug.spotless.FormatterStep;
import com.diffplug.spotless.JreVersion;
import com.diffplug.spotless.TestProvisioner;
import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
import com.diffplug.spotless.extra.eclipse.EclipseCommonTests;
Expand All @@ -24,7 +25,12 @@ public class EclipseCdtFormatterStepTest extends EclipseCommonTests {

@Override
protected String[] getSupportedVersions() {
return new String[]{"4.7.3a", "4.11.0", "4.12.0", "4.13.0"};
return new String[]{"4.17.0"};
}

@Override
protected void makeAssumptions() {
JreVersion.assume11OrGreater();
}

@Override
Expand Down
Loading

0 comments on commit 2d02701

Please sign in to comment.