Merge branch 'master' into feature/typescript-formatting-using-nodejs-in-j2v8

# Conflicts:
#	plugin-gradle/README.md
#	plugin-gradle/src/main/java/com/diffplug/gradle/spotless/SpotlessExtension.java

Author: simschla

CHANGES.md

@@ -7,6 +7,9 @@ You might be looking for:
 
 ### Version 1.15.0-SNAPSHOT - TBD (javadoc [lib](https://diffplug.github.io/spotless/javadoc/spotless-lib/snapshot/) [lib-extra](https://diffplug.github.io/spotless/javadoc/spotless-lib-extra/snapshot/), [snapshot repo](https://oss.sonatype.org/content/repositories/snapshots/com/diffplug/spotless/))
 
+* Added C/C++ support ([#232](https://github.com/diffplug/spotless/issues/232)).
+* Integrated Eclipse CDT formatter ([#274](https://github.com/diffplug/spotless/pull/274))
+* Extended dependency provisioner to exclude transitives on request ([#297](https://github.com/diffplug/spotless/pull/297)).This prevents unnecessary downloads of unused transitive dependencies for Eclipse based formatter steps.
 * Updated default groovy-eclipse from 4.8.0 to 4.8.1 ([#288](https://github.com/diffplug/spotless/pull/288)). New version is based on [Groovy-Eclipse 3.0.0](https://github.com/groovy/groovy-eclipse/wiki/3.0.0-Release-Notes).
 * Integrated Eclipse WTP formatter ([#290](https://github.com/diffplug/spotless/pull/290))
 * Updated JSR305 annotation from 3.0.0 to 3.0.2 ([#274](https://github.com/diffplug/spotless/pull/274))

README.md

@@ -38,6 +38,7 @@ lib('generic.LicenseHeaderStep')                 +'{{yes}}       | {{yes}}
 lib('generic.ReplaceRegexStep')                  +'{{yes}}       | {{yes}}       | {{no}}  |',
 lib('generic.ReplaceStep')                       +'{{yes}}       | {{yes}}       | {{no}}  |',
 lib('generic.TrimTrailingWhitespaceStep')        +'{{yes}}       | {{yes}}       | {{no}}  |',
+extra('cpp.EclipseFormatterStep')                +'{{yes}}       | {{yes}}       | {{no}}  |',
 extra('groovy.GrEclipseFormatterStep')           +'{{yes}}       | {{no}}       | {{no}}  |',
 lib('java.GoogleJavaFormatStep')                 +'{{yes}}       | {{yes}}      | {{no}}  |',
 lib('java.ImportOrderStep')                      +'{{yes}}       | {{yes}}      | {{no}}  |',
@@ -49,6 +50,7 @@ lib('npm.PrettierFormatterStep')                 +'{{yes}}       | {{no}}
 lib('npm.TsFmtFormatterStep')                    +'{{yes}}       | {{no}}       | {{no}}  |',
 lib('scala.ScalaFmtStep')                        +'{{yes}}       | {{yes}}       | {{no}}  |',
 lib('sql.DBeaverSQLFormatterStep')               +'{{yes}}       | {{no}}       | {{no}}  |',
+extra('wtp.WtpEclipseFormatterStep')             +'{{yes}}       | {{yes}}      | {{no}}  |',
 '| [(Your FormatterStep here)](CONTRIBUTING.md#how-to-add-a-new-formatterstep) | {{no}}        | {{no}}       | {{no}}  |',
 '| Fast up-to-date checking                      | {{yes}}       | {{no}}       | {{no}}  |',
 '| Automatic idempotency safeguard               | {{yes}}       | {{no}}       | {{no}}  |',
@@ -63,6 +65,7 @@ lib('sql.DBeaverSQLFormatterStep')               +'{{yes}}       | {{no}}
 | [`generic.ReplaceRegexStep`](lib/src/main/java/com/diffplug/spotless/generic/ReplaceRegexStep.java) | :+1:       | :+1:       | :white_large_square:  |
 | [`generic.ReplaceStep`](lib/src/main/java/com/diffplug/spotless/generic/ReplaceStep.java) | :+1:       | :+1:       | :white_large_square:  |
 | [`generic.TrimTrailingWhitespaceStep`](lib/src/main/java/com/diffplug/spotless/generic/TrimTrailingWhitespaceStep.java) | :+1:       | :+1:       | :white_large_square:  |
+| [`cpp.EclipseFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/cpp/EclipseFormatterStep.java) | :+1:       | :+1:       | :white_large_square:  |
 | [`groovy.GrEclipseFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java) | :+1:       | :white_large_square:       | :white_large_square:  |
 | [`java.GoogleJavaFormatStep`](lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java) | :+1:       | :+1:      | :white_large_square:  |
 | [`java.ImportOrderStep`](lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java) | :+1:       | :+1:      | :white_large_square:  |
@@ -74,6 +77,7 @@ lib('sql.DBeaverSQLFormatterStep')               +'{{yes}}       | {{no}}
 | [`npm.TsFmtFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java) | :+1:       | :white_large_square:       | :white_large_square:  |
 | [`scala.ScalaFmtStep`](lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java) | :+1:       | :+1:       | :white_large_square:  |
 | [`sql.DBeaverSQLFormatterStep`](lib/src/main/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStep.java) | :+1:       | :white_large_square:       | :white_large_square:  |
+| [`wtp.WtpEclipseFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/WtpEclipseFormatterStep.java) | :+1:       | :+1:      | :white_large_square:  |
 | [(Your FormatterStep here)](CONTRIBUTING.md#how-to-add-a-new-formatterstep) | :white_large_square:        | :white_large_square:       | :white_large_square:  |
 | Fast up-to-date checking                      | :+1:       | :white_large_square:       | :white_large_square:  |
 | Automatic idempotency safeguard               | :+1:       | :white_large_square:       | :white_large_square:  |

_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImplTest.java

@@ -41,88 +41,88 @@ public static void initializeStatic() throws Exception {
 
 	@Test
 	public void simpleDefaultFormat() throws Throwable {
-		String output = format(TEST_DATA.input("xml_space.xml"), config -> {});
+		String output = format(TEST_DATA.input("xml_space.test"), config -> {});
 		assertEquals("Unexpected formatting with default preferences.",
-				TEST_DATA.expected("xml_space.xml"), output);
+				TEST_DATA.expected("xml_space.test"), output);
 	}
 
 	@Test
 	public void invalidXmlFormat() throws Throwable {
-		String[] input = TEST_DATA.input("xml_space.xml");
+		String[] input = TEST_DATA.input("xml_space.test");
 		input[0] += INCOMPLETE;
 		String output = format(input, config -> {});
-		String expected = TEST_DATA.expected("xml_space.xml") + LINE_DELIMITER + INCOMPLETE;
+		String expected = TEST_DATA.expected("xml_space.test") + LINE_DELIMITER + INCOMPLETE;
 		assertEquals("Incomplete XML not formatted on best effort basis.",
 				expected, output);
 	}
 
 	@Test
 	public void illegalXmlCharater() throws Throwable {
-		String[] input = TEST_DATA.input("xml_space.xml");
+		String[] input = TEST_DATA.input("xml_space.test");
 		input[0] = ILLEGAL_CHAR + input[0];
 		String output = format(input, config -> {});
-		String expected = LINE_DELIMITER + LINE_DELIMITER + TEST_DATA.expected("xml_space.xml");
+		String expected = LINE_DELIMITER + LINE_DELIMITER + TEST_DATA.expected("xml_space.test");
 		assertEquals("Illegal character not replaced by line delimiter.", expected, output);
 	}
 
 	@Test
 	public void multipleConfigurations() throws Throwable {
-		String output = format(TEST_DATA.input("xml_space.xml"), config -> {
+		String output = format(TEST_DATA.input("xml_space.test"), config -> {
 			config.setProperty(INDENTATION_SIZE, "2");
 			config.setProperty(INDENTATION_CHAR, SPACE);
 		});
-		String expected = TEST_DATA.expected("xml_space.xml").replace("\t", "  ");
+		String expected = TEST_DATA.expected("xml_space.test").replace("\t", "  ");
 		assertEquals("Custom indentation configuration not applied.", expected, output);
 
-		output = format(TEST_DATA.input("xml_space.xml"), config -> {
+		output = format(TEST_DATA.input("xml_space.test"), config -> {
 			config.setProperty(SPLIT_MULTI_ATTRS, Boolean.toString(true));
 		});
-		expected = TEST_DATA.expected("xml_space.xml");
+		expected = TEST_DATA.expected("xml_space.test");
 		expected = expected.replace(" a=", LINE_DELIMITER + "\ta=");
 		expected = expected.replace(" b=", LINE_DELIMITER + "\tb=");
 		assertEquals("Custom indentation configuration not reverted or custom multiple argument configuration not applied.", expected, output);
 	}
 
 	@Test
 	public void invalidConfiguration() throws Throwable {
-		String output = format(TEST_DATA.input("xml_space.xml"), config -> {
+		String output = format(TEST_DATA.input("xml_space.test"), config -> {
 			config.setProperty(INDENTATION_SIZE, "Not an integer");
 			config.setProperty(INDENTATION_CHAR, SPACE);
 		});
 		assertEquals("Invalid indentation configuration not replaced by default value (0 spaces)",
-				TEST_DATA.expected("xml_space.xml").replace("\t", ""), output);
+				TEST_DATA.expected("xml_space.test").replace("\t", ""), output);
 	}
 
 	@Test
 	public void dtdRelativePath() throws Throwable {
-		String output = format(TEST_DATA.input("dtd_relative.xml"), config -> {});
+		String output = format(TEST_DATA.input("dtd_relative.test"), config -> {});
 		assertEquals("Relative DTD not resolved. Restrictions are not applied by formatter.",
-				TEST_DATA.expected("dtd_relative.xml"), output);
+				TEST_DATA.expected("dtd_relative.test"), output);
 	}
 
 	@Test
 	public void xsdRelativePath() throws Throwable {
-		String output = format(TEST_DATA.input("xsd_relative.xml"), config -> {});
+		String output = format(TEST_DATA.input("xsd_relative.test"), config -> {});
 		assertEquals("Relative XSD not resolved. Restrictions are not applied by formatter.",
-				TEST_DATA.expected("xsd_relative.xml"), output);
+				TEST_DATA.expected("xsd_relative.test"), output);
 	}
 
 	@Test
 	public void xsdNotFound() throws Throwable {
-		String output = format(TEST_DATA.input("xsd_not_found.xml"), config -> {});
+		String output = format(TEST_DATA.input("xsd_not_found.test"), config -> {});
 		assertEquals("Unresolved XSD/DTD not silently ignored.",
-				TEST_DATA.expected("xsd_not_found.xml"), output);
+				TEST_DATA.expected("xsd_not_found.test"), output);
 	}
 
 	@Test
 	public void catalogLookup() throws Throwable {
-		String output = format(TEST_DATA.input("xsd_not_found.xml"), config -> {
+		String output = format(TEST_DATA.input("xsd_not_found.test"), config -> {
 			config.setProperty(
 					SpotlessPreferences.USER_CATALOG,
 					TEST_DATA.getRestrictionsPath("catalog.xml").toString());
 		});
 		assertEquals("XSD not resolved by catalog. Restrictions are not applied by formatter.",
-				TEST_DATA.expected("xsd_not_found.xml").replace(" remove spaces ", "remove spaces"), output);
+				TEST_DATA.expected("xsd_not_found.test").replace(" remove spaces ", "remove spaces"), output);
 	}
 
 	private static String format(final String[] input, final Consumer<Properties> config) throws Exception {

_ext/eclipse-wtp/src/test/resources/xml/expected/dtd_relative.xml renamed to _ext/eclipse-wtp/src/test/resources/xml/expected/dtd_relative.test

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-	<!-- OASIS: If the catalog entry file is specified with a relative URI, it is relative to the base URI of the document that contains the processing instruction. -->
-    <system systemId="http://foo.bar/test.xsd" uri="./test.xsd"/>
+  <!-- OASIS: If the catalog entry file is specified with a relative URI, it is relative to the base URI of the document that contains the processing instruction. -->
+  <system systemId="http://foo.bar/test.xsd" uri="./test.xsd" />
 </catalog>

_ext/eclipse-wtp/src/test/resources/xml/expected/xml_space.xml renamed to _ext/eclipse-wtp/src/test/resources/xml/expected/xml_space.test

@@ -6,14 +6,14 @@
         <xs:element name="x">
           <xs:simpleType>
             <xs:restriction base="xs:string">
-              <xs:whiteSpace value="collapse"/>
+              <xs:whiteSpace value="collapse" />
             </xs:restriction>
           </xs:simpleType>
-		</xs:element>        
+        </xs:element>
         <xs:element name="y">
           <xs:simpleType>
             <xs:restriction base="xs:string">
-              <xs:whiteSpace value="preserve"/>
+              <xs:whiteSpace value="preserve" />
             </xs:restriction>
           </xs:simpleType>
         </xs:element>

_ext/eclipse-wtp/src/test/resources/xml/expected/xsd_not_found.xml renamed to _ext/eclipse-wtp/src/test/resources/xml/expected/xsd_not_found.test

@@ -152,7 +152,7 @@ public static class State implements Serializable {
 
 		/** State constructor expects that all passed items are not modified afterwards */
 		protected State(String formatterStepExt, Provisioner jarProvisioner, List<String> dependencies, Iterable<File> settingsFiles) throws IOException {
-			this.jarState = JarState.from(dependencies, jarProvisioner);
+			this.jarState = JarState.withoutTransitives(dependencies, jarProvisioner);
 			this.settingsFiles = FileSignature.signAsList(settingsFiles);
 			this.formatterStepExt = formatterStepExt;
 		}

_ext/eclipse-wtp/src/test/resources/xml/expected/xsd_relative.xml renamed to _ext/eclipse-wtp/src/test/resources/xml/expected/xsd_relative.test

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2016 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;
+
+import java.lang.reflect.Method;
+import java.util.Properties;
+
+import com.diffplug.spotless.FormatterFunc;
+import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
+import com.diffplug.spotless.extra.EclipseBasedStepBuilder.State;
+
+/** Formatter step which calls out to the Eclipse CDT formatter. */
+public final class EclipseCdtFormatterStep {
+	// prevent direct instantiation
+	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.7.3a";
+	private static final String FORMATTER_METHOD = "format";
+
+	public static String defaultVersion() {
+		return DEFAULT_VERSION;
+	}
+
+	/** Provides default configuration */
+	public static EclipseBasedStepBuilder createBuilder(Provisioner provisioner) {
+		return new EclipseBasedStepBuilder(NAME, provisioner, EclipseCdtFormatterStep::apply);
+	}
+
+	private static FormatterFunc apply(State state) throws Exception {
+		Class<?> formatterClazz = state.loadClass(FORMATTER_CLASS);
+		Object formatter = formatterClazz.getConstructor(Properties.class).newInstance(state.getPreferences());
+		Method method = formatterClazz.getMethod(FORMATTER_METHOD, String.class);
+		return input -> (String) method.invoke(formatter, input);
+	}
+
+}

_ext/eclipse-wtp/src/test/resources/xml/input/dtd_relative.xml renamed to _ext/eclipse-wtp/src/test/resources/xml/input/dtd_relative.test

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@ReturnValuesAreNonnullByDefault
+package com.diffplug.spotless.extra.cpp;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+import com.diffplug.spotless.annotations.ReturnValuesAreNonnullByDefault;

_ext/eclipse-wtp/src/test/resources/xml/input/xml_space.xml renamed to _ext/eclipse-wtp/src/test/resources/xml/input/xml_space.test

@@ -25,9 +25,9 @@
 import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
 
 /** Formatter step which calls out to the Groovy-Eclipse formatter. */
-public final class WtpEclipseFormatterStep {
+public final class EclipseWtpFormatterStep {
 	// prevent direct instantiation
-	private WtpEclipseFormatterStep() {}
+	private EclipseWtpFormatterStep() {}
 
 	private static final String NAME = "eclipse wtp formatters";
 	private static final String FORMATTER_PACKAGE = "com.diffplug.spotless.extra.eclipse.wtp.";

_ext/eclipse-wtp/src/test/resources/xml/input/xsd_not_found.xml renamed to _ext/eclipse-wtp/src/test/resources/xml/input/xsd_not_found.test

@@ -0,0 +1,21 @@
+# Spotless formatter based on CDT version 9.4.3 (see https://www.eclipse.org/cdt/)
+com.diffplug.spotless:spotless-eclipse-cdt:9.4.4
+com.diffplug.spotless:spotless-eclipse-base:3.0.0
+com.google.code.findbugs:annotations:3.0.0
+com.google.code.findbugs:jsr305:3.0.0
+com.ibm.icu:icu4j:61.1
+org.eclipse.platform:org.eclipse.core.commands:3.9.100
+org.eclipse.platform:org.eclipse.core.contenttype:3.7.0
+org.eclipse.platform:org.eclipse.core.filebuffers:3.6.200
+org.eclipse.platform:org.eclipse.core.filesystem:1.7.100
+org.eclipse.platform:org.eclipse.core.jobs:3.10.0
+org.eclipse.platform:org.eclipse.core.resources:3.13.0
+org.eclipse.platform:org.eclipse.core.runtime:3.14.0
+org.eclipse.platform:org.eclipse.equinox.app:1.3.500
+org.eclipse.platform:org.eclipse.equinox.common:3.10.0
+org.eclipse.platform:org.eclipse.equinox.preferences:3.7.100
+org.eclipse.platform:org.eclipse.equinox.registry:3.8.0
+org.eclipse.platform:org.eclipse.jface.text:3.13.0
+org.eclipse.platform:org.eclipse.jface:3.14.0
+org.eclipse.platform:org.eclipse.osgi:3.13.0
+org.eclipse.platform:org.eclipse.text:3.6.300

_ext/eclipse-wtp/src/test/resources/xml/input/xsd_relative.xml renamed to _ext/eclipse-wtp/src/test/resources/xml/input/xsd_relative.test

@@ -17,10 +17,8 @@ org.eclipse.platform:org.eclipse.equinox.app:1.3.500
 org.eclipse.platform:org.eclipse.equinox.common:3.10.0
 org.eclipse.platform:org.eclipse.equinox.preferences:3.7.100
 org.eclipse.platform:org.eclipse.equinox.registry:3.8.0
-#Spotless currently loads all transitive dependencies.
-#jface requires platform specific JARs (not used by formatter), which are not hosted via M2.
-#org.eclipse.platform:org.eclipse.jface.text:3.13.0
-#org.eclipse.platform:org.eclipse.jface:3.14.0
+org.eclipse.platform:org.eclipse.jface.text:3.13.0
+org.eclipse.platform:org.eclipse.jface:3.14.0
 org.eclipse.platform:org.eclipse.osgi.services:3.7.0
 org.eclipse.platform:org.eclipse.osgi:3.13.0
 org.eclipse.platform:org.eclipse.text:3.6.300

_ext/eclipse-wtp/src/test/resources/xml/restrictions/catalog.xml

@@ -12,9 +12,7 @@ org.eclipse.platform:org.eclipse.equinox.app:1.3.500
 org.eclipse.platform:org.eclipse.equinox.common:3.10.0
 org.eclipse.platform:org.eclipse.equinox.preferences:3.7.100
 org.eclipse.platform:org.eclipse.equinox.registry:3.8.0
-#Spotless currently loads all transitive dependencies.
-#jface requires platform specific JARs (not used by formatter), which are not hosted via M2.
-#org.eclipse.platform:org.eclipse.jface.text:3.13.0
-#org.eclipse.platform:org.eclipse.jface:3.14.0
+org.eclipse.platform:org.eclipse.jface.text:3.13.0
+org.eclipse.platform:org.eclipse.jface:3.14.0
 org.eclipse.platform:org.eclipse.osgi:3.13.0
 org.eclipse.platform:org.eclipse.text:3.6.300

_ext/eclipse-wtp/src/test/resources/xml/restrictions/test.xsd

@@ -12,9 +12,7 @@ org.eclipse.platform:org.eclipse.equinox.app:1.3.500
 org.eclipse.platform:org.eclipse.equinox.common:3.10.0
 org.eclipse.platform:org.eclipse.equinox.preferences:3.7.100
 org.eclipse.platform:org.eclipse.equinox.registry:3.8.0
-#Spotless currently loads all transitive dependencies.
-#jface requires platform specific JARs (not used by formatter), which are not hosted via M2.
-#org.eclipse.platform:org.eclipse.jface.text:3.13.0
-#org.eclipse.platform:org.eclipse.jface:3.14.0
+org.eclipse.platform:org.eclipse.jface.text:3.13.0
+org.eclipse.platform:org.eclipse.jface:3.14.0
 org.eclipse.platform:org.eclipse.osgi:3.13.0
 org.eclipse.platform:org.eclipse.text:3.6.300

lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2016 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;
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.TestProvisioner;
+import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
+import com.diffplug.spotless.extra.eclipse.EclipseCommonTests;
+
+public class EclipseCdtFormatterStepTest extends EclipseCommonTests {
+
+	@Override
+	protected String[] getSupportedVersions() {
+		return new String[]{"4.7.3a"};
+	}
+
+	@Override
+	protected String getTestInput(String version) {
+		return "#include <a.h>;\nint main(int argc,   \nchar *argv[]) {}";
+	}
+
+	@Override
+	protected String getTestExpectation(String version) {
+		return "#include <a.h>;\nint main(int argc, char *argv[]) {\n}\n";
+	}
+
+	@Override
+	protected FormatterStep createStep(String version) {
+		EclipseBasedStepBuilder builder = EclipseCdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
+		builder.setVersion(version);
+		return builder.build();
+	}
+
+}

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

@@ -22,6 +22,7 @@
 import org.junit.Test;
 
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.ResourceHarness;
 
 /**
@@ -78,7 +79,7 @@ public void testSupportedVersions() throws Exception {
 			}
 			String output = null;
 			try {
-				output = step.format(input, inputFile);
+				output = LineEnding.toUnix(step.format(input, inputFile));
 			} catch (Exception e) {
 				fail("Exception occured when formatting input with version: " + version, e);
 			}