Merge pull request #375 from diffplug/eclipse-groovy-upgrade

Switch to Groovy-Eclipse release 3.2.0. Include Eclipse logging.

Author: nedtwigg

_ext/eclipse-groovy/CHANGES.md

@@ -0,0 +1,18 @@
+# spotless-eclipse-groovy
+
+### Version 3.2.0 - March 16th 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-groovy)))
+
+* Switch to Groovy-Eclipse release 3.2.0 for Eclipse 4.10 ([#375](https://github.com/diffplug/spotless/pull/375)).
+* Include Eclipse logging allowing formatter warnings/errors to be logged via SLF4J ([#236](https://github.com/diffplug/spotless/issues/236)).
+
+### Version 3.0.1 - February 25th 2019 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-groovy)))
+
+* Replaced `http` update-site with `https` ([#360](https://github.com/diffplug/spotless/issues/360)).
+
+### Version 3.0.0 - Sep 4th 2018 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-groovy)))
+
+* Switch to Groovy-Eclipse release 3.0.0 and Groovy 2.6 ([#288](https://github.com/diffplug/spotless/issues/288)).
+
+### Version 2.9.2 - Jul 19th 2018 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-groovy)))
+
+* Initial release!

_ext/eclipse-groovy/build.gradle

@@ -2,8 +2,8 @@ ext {
 	developers = [
 		fvgh: [ name: 'Frank Vennemeyer', email: '[email protected]' ],
 	]
-
-	p2Repository = "https://dist.springsource.org/release/GRECLIPSE/e${VER_ECLIPSE}"
+	
+	p2Repository = "https://dist.springsource.org/release/GRECLIPSE/${VER_GRECLIPSE}/e${VER_ECLIPSE}"
 
     p2Dependencies = [
 		'org.codehaus.groovy.eclipse.refactoring':'+', // GroovyFormatter and related
@@ -37,6 +37,7 @@ dependencies {
 	compile ("org.eclipse.platform:org.eclipse.jface.text:${VER_ECLISPE_JFACE}") {
 		exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
 	}
+	testCompile("org.slf4j:slf4j-simple:${VER_SLF4J}")
 }
 
 //////////

_ext/eclipse-groovy/gradle.properties

@@ -1,7 +1,7 @@
 # Versions correspond to the Groovy-Eclipse version used for the fat-JAR.
 # See https://github.com/groovy/groovy-eclipse/releases for further information about Groovy-Eclipse versions.
 # Patch version can be incremented independently for backward compatible patches of this library. 
-ext_version=3.0.1
+ext_version=3.2.0
 ext_artifactId=spotless-eclipse-groovy
 ext_description=Groovy Eclipse's formatter bundled for Spotless
 
@@ -12,7 +12,11 @@ ext_group=com.diffplug.spotless
 ext_VER_JAVA=1.8
 
 # Compile
-VER_ECLIPSE=4.8
-VER_SPOTLESS_ECLISPE_BASE=[3.0.0,4.0.0[
+VER_ECLIPSE=4.10
+VER_SPOTLESS_ECLISPE_BASE=[3.1.0,4.0.0[
 VER_ECLISPE_JFACE=[3.12.0,4.0.0[
+VER_GRECLIPSE=3.2.0
 VER_GROOVY=2.6.0
+
+# Provided dependencies
+VER_SLF4J=[1.6,2.0[

_ext/eclipse-groovy/src/main/java/com/diffplug/spotless/extra/eclipse/groovy/GrEclipseFormatterStepImpl.java

@@ -33,8 +33,6 @@
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.ILogListener;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.log.ExtendedLogReaderService;
-import org.eclipse.equinox.log.ExtendedLogService;
 import org.eclipse.jface.preference.PreferenceStore;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
@@ -57,12 +55,10 @@ public class GrEclipseFormatterStepImpl {
 	private final boolean ignoreFormatterProblems;
 
 	public GrEclipseFormatterStepImpl(final Properties properties) throws Exception {
-		SpotlessLogService logService = new SpotlessLogService();
 		if (SpotlessEclipseFramework.setup(
 				config -> {
 					config.applyDefault();
-					config.add(ExtendedLogService.class, logService);
-					config.add(ExtendedLogReaderService.class, logService);
+					config.useSlf4J(GrEclipseFormatterStepImpl.class.getPackage().getName());
 				},
 				plugins -> {
 					plugins.add(new GroovyCoreActivator());