Merge pull request #382 from diffplug/eclipse-goovy-wtp-upgrade

nedtwigg · web-flow · commit 159770b1e0fe · 2019-03-26T14:09:20.000-07:00
Changed default versions. WTP changed to v4.8. Groovy changed to v4.10.
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java
@@ -35,7 +35,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.8.1";
+	private static final String DEFAULT_VERSION = "4.10.0";
 	private static final String FORMATTER_METHOD = "format";
 
 	/** Creates a formatter step using the default version for the given settings file. */
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java
@@ -37,7 +37,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.7.3b";
+	private static final String DEFAULT_VERSION = "4.8.0";
 	private static final String FORMATTER_METHOD = "format";
 
 	private final String implementationClassName;
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatters/v4.8.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatters/v4.8.0.lockfile
@@ -0,0 +1,25 @@
+# Spotless formatter based on Eclipse-WTP version 3.9.5 (see https://www.eclipse.org/webtools/)
+com.diffplug.spotless:spotless-eclipse-wtp:3.10.0
+com.diffplug.spotless:spotless-eclipse-base:3.1.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.emf:org.eclipse.emf.common:2.15.0
+org.eclipse.emf:org.eclipse.emf.ecore:2.15.0
+org.eclipse.platform:org.eclipse.core.commands:3.9.300
+org.eclipse.platform:org.eclipse.core.contenttype:3.7.300
+org.eclipse.platform:org.eclipse.core.filebuffers:3.6.500
+org.eclipse.platform:org.eclipse.core.filesystem:1.7.300
+org.eclipse.platform:org.eclipse.core.jobs:3.10.300
+org.eclipse.platform:org.eclipse.core.resources:3.13.300
+org.eclipse.platform:org.eclipse.core.runtime:3.15.200
+org.eclipse.platform:org.eclipse.equinox.app:1.4.100
+org.eclipse.platform:org.eclipse.equinox.common:3.10.300
+org.eclipse.platform:org.eclipse.equinox.preferences:3.7.300
+org.eclipse.platform:org.eclipse.equinox.registry:3.8.300
+org.eclipse.platform:org.eclipse.jface.text:3.15.100
+org.eclipse.platform:org.eclipse.jface:3.15.100
+org.eclipse.platform:org.eclipse.osgi.services:3.8.0
+org.eclipse.platform:org.eclipse.osgi:3.13.300
+org.eclipse.platform:org.eclipse.text:3.8.100
+org.eclipse.xsd:org.eclipse.xsd:2.12.0
diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/groovy_eclipse_formatter/v4.10.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/groovy_eclipse_formatter/v4.10.0.lockfile
@@ -0,0 +1,18 @@
+# Spotless formatter based on Groovy-Eclipse version 3.0.0 (see https://github.com/groovy/groovy-eclipse/releases)
+com.diffplug.spotless:spotless-eclipse-groovy:3.2.0
+com.diffplug.spotless:spotless-eclipse-base:3.1.0
+com.google.code.findbugs:annotations:3.0.0
+com.google.code.findbugs:jsr305:3.0.0
+org.eclipse.platform:org.eclipse.core.commands:3.9.300
+org.eclipse.platform:org.eclipse.core.contenttype:3.7.300
+org.eclipse.platform:org.eclipse.core.jobs:3.10.300
+org.eclipse.platform:org.eclipse.core.resources:3.13.300
+org.eclipse.platform:org.eclipse.core.runtime:3.15.200
+org.eclipse.platform:org.eclipse.equinox.app:1.4.100
+org.eclipse.platform:org.eclipse.equinox.common:3.10.300
+org.eclipse.platform:org.eclipse.equinox.preferences:3.7.300
+org.eclipse.platform:org.eclipse.equinox.registry:3.8.300
+org.eclipse.platform:org.eclipse.jface.text:3.15.100
+org.eclipse.platform:org.eclipse.jface:3.15.100
+org.eclipse.platform:org.eclipse.osgi:3.13.300
+org.eclipse.platform:org.eclipse.text:3.8.100
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java
@@ -23,7 +23,7 @@
 public class GrEclipseFormatterStepTest extends EclipseCommonTests {
 	@Override
 	protected String[] getSupportedVersions() {
-		return new String[]{"2.3.0", "4.6.3", "4.8.0", "4.8.1"};
+		return new String[]{"2.3.0", "4.6.3", "4.8.0", "4.8.1", "4.10.0"};
 	}
 
 	@Override
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStepTest.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStepTest.java
@@ -76,7 +76,7 @@ public static Iterable<WTP> data() {
 
 	@Override
 	protected String[] getSupportedVersions() {
-		return new String[]{"4.7.3a", "4.7.3b"};
+		return new String[]{"4.7.3a", "4.7.3b", "4.8.0"};
 	}
 
 	@Override
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
@@ -1,6 +1,8 @@
 # spotless-plugin-gradle releases
 
 ### Version 3.21.0-SNAPSHOT - TBD ([javadoc](https://diffplug.github.io/spotless/javadoc/snapshot/), [snapshot](https://oss.sonatype.org/content/repositories/snapshots/com/diffplug/spotless/spotless-plugin-gradle/))
+* Updated default eclipse-wtp from 4.7.3b to 4.8.0 ([#382](https://github.com/diffplug/spotless/pull/382)).
+* Updated default eclipse-groovy from 4.8.1 to 4.10.0 ([#382](https://github.com/diffplug/spotless/pull/382)).
 
 ### Version 3.20.0 - March 11th 2019 ([javadoc](https://diffplug.github.io/spotless/javadoc/spotless-plugin-gradle/3.20.0/), [jcenter](https://bintray.com/diffplug/opensource/spotless-plugin-gradle/3.20.0))
 
diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md
@@ -491,7 +491,7 @@ spotless {
     }
     // Use for example eclipseWtp('xml', '4.7.3a') to specify a specific version of Eclipse,
     // available versions are: https://github.com/diffplug/spotless/tree/master/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatters
-    eclipseWtp('xml').configFile 'spotless.xml.prefs' 'spotless.common.properties'
+    eclipseWtp('xml').configFile 'spotless.xml.prefs', 'spotless.common.properties'
   }
 }
 ```
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
@@ -1,6 +1,8 @@
 # spotless-plugin-maven releases
 
 ### Version 1.21.0-SNAPSHOT - TBD ([javadoc](https://diffplug.github.io/spotless/javadoc/spotless-maven-plugin/snapshot/), [snapshot](https://oss.sonatype.org/content/repositories/snapshots/com/diffplug/spotless/spotless-maven-plugin/))
+* Updated default eclipse-wtp from 4.7.3b to 4.8.0 ([#382](https://github.com/diffplug/spotless/pull/382)).
+* Updated default eclipse-groovy from 4.8.1 to 4.10.0 ([#382](https://github.com/diffplug/spotless/pull/382)).
 
 ### Version 1.20.0 - March 14th 2019 ([javadoc](https://diffplug.github.io/spotless/javadoc/spotless-maven-plugin/1.20.0/), [jcenter](https://bintray.com/diffplug/opensource/spotless-maven-plugin/1.20.0))
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`public class GrEclipseFormatterStepTest extends EclipseCommonTests {`
`24`	`24`	`@Override`
`25`	`25`	`protected String[] getSupportedVersions() {`
`26`		`- return new String[]{"2.3.0", "4.6.3", "4.8.0", "4.8.1"};`
	`26`	`+ return new String[]{"2.3.0", "4.6.3", "4.8.0", "4.8.1", "4.10.0"};`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public static Iterable<WTP> data() {`
`76`	`76`
`77`	`77`	`@Override`
`78`	`78`	`protected String[] getSupportedVersions() {`
`79`		`- return new String[]{"4.7.3a", "4.7.3b"};`
	`79`	`+ return new String[]{"4.7.3a", "4.7.3b", "4.8.0"};`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -491,7 +491,7 @@ spotless {`
`491`	`491`	`}`
`492`	`492`	`// Use for example eclipseWtp('xml', '4.7.3a') to specify a specific version of Eclipse,`
`493`	`493`	`// available versions are: https://github.com/diffplug/spotless/tree/master/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatters`
`494`		`- eclipseWtp('xml').configFile 'spotless.xml.prefs' 'spotless.common.properties'`
	`494`	`+ eclipseWtp('xml').configFile 'spotless.xml.prefs', 'spotless.common.properties'`
`495`	`495`	`}`
`496`	`496`	`}`
`497`	`497`	```