Fix GrEclipse for 4.18 through 4.26

Author: nedtwigg

lib-extra/build.gradle

@@ -7,7 +7,7 @@ version = rootProject.spotlessChangelog.versionNext
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
-String VER_SOLSTICE = '0.19.1'
+String VER_SOLSTICE = '0.19.2'
 dependencies {
 	api project(':lib')
 	// misc useful utilities

lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java

@@ -18,6 +18,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -38,8 +39,10 @@
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.TextSelection;
+import org.eclipse.osgi.internal.location.EquinoxLocations;
 import org.eclipse.text.edits.TextEdit;
 import org.osgi.framework.Constants;
+import org.slf4j.LoggerFactory;
 
 import dev.equo.solstice.NestedJars;
 import dev.equo.solstice.ShimIdeBootstrapServices;
@@ -49,20 +52,22 @@
 /** Spotless-Formatter step which calls out to the Groovy-Eclipse formatter. */
 public class GrEclipseFormatterStepImpl {
 	static {
-		System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "info");
 		NestedJars.setToWarnOnly();
 		NestedJars.onClassPath().confirmAllNestedJarsArePresentOnClasspath(CacheLocations.nestedJars());
-
-		var solstice = Solstice.findBundlesOnClasspath();
-		solstice.warnAndModifyManifestsToFix();
-		var props = Map.of("osgi.nl", "en_US",
-				Constants.FRAMEWORK_STORAGE_CLEAN, Constants.FRAMEWORK_STORAGE_CLEAN_ONFIRSTINIT);
-		solstice.openShim(props);
-		ShimIdeBootstrapServices.apply(props, solstice.getContext());
-		solstice.start("org.apache.felix.scr");
-		solstice.startAllWithLazy(false);
-		//		solstice.start("org.eclipse.core.resources");
-		solstice.start("org.codehaus.groovy.eclipse.core");
+		try {
+			var solstice = Solstice.findBundlesOnClasspath();
+			solstice.warnAndModifyManifestsToFix();
+			var props = Map.of("osgi.nl", "en_US",
+					Constants.FRAMEWORK_STORAGE_CLEAN, Constants.FRAMEWORK_STORAGE_CLEAN_ONFIRSTINIT,
+					EquinoxLocations.PROP_INSTANCE_AREA, Files.createTempDirectory("spotless-groovy").toAbsolutePath().toString());
+			solstice.openShim(props);
+			ShimIdeBootstrapServices.apply(props, solstice.getContext());
+			solstice.start("org.apache.felix.scr");
+			solstice.startAllWithLazy(false);
+			solstice.start("org.codehaus.groovy.eclipse.core");
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
 	}
 
 	/**

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

@@ -88,7 +88,7 @@ EquoBasedStepBuilder.State get() throws Exception {
 		var query = model(formatterVersion).query(P2ClientCache.PREFER_OFFLINE, P2QueryCache.ALLOW);
 		var classpath = new ArrayList<File>();
 		var mavenDeps = new ArrayList<String>();
-		mavenDeps.add("dev.equo.ide:solstice:0.19.1");
+		mavenDeps.add("dev.equo.ide:solstice:0.19.2");
 		mavenDeps.add("com.diffplug.durian:durian-swt.os:4.1.1");
 		mavenDeps.add("org.slf4j:slf4j-simple:1.7.36");
 		mavenDeps.addAll(query.getJarsOnMavenCentral());

lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java

@@ -23,12 +23,13 @@
 import com.diffplug.spotless.TestProvisioner;
 import com.diffplug.spotless.extra.eclipse.EquoResourceHarness;
 
-class GrEclipseFormatterStepTest extends EquoResourceHarness {
+public class GrEclipseFormatterStepTest extends EquoResourceHarness {
 	private final static String INPUT = "class F{ def m(){} }";
 	private final static String EXPECTED = "class F{\n\tdef m(){}\n}";
 
 	public GrEclipseFormatterStepTest() {
 		super(GrEclipseFormatterStep.createBuilder(TestProvisioner.mavenCentral()), INPUT, EXPECTED);
+		System.setProperty("org.gradle.logging.level", "info");
 	}
 
 	@ParameterizedTest
@@ -38,6 +39,6 @@ void formatWithVersion(String version) throws Exception {
 	}
 
 	private static Stream<String> formatWithVersion() {
-		return Stream.of("4.21", GrEclipseFormatterStep.defaultVersion());
+		return Stream.of("4.18", GrEclipseFormatterStep.defaultVersion());
 	}
 }