Added EquoBasedStepBuilder.addPlatformRepo which handles how the core platform IUs change with different versions.

Author: nedtwigg

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

@@ -39,6 +39,7 @@
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.TextSelection;
 import org.eclipse.text.edits.TextEdit;
+import org.osgi.framework.Constants;
 
 import dev.equo.solstice.NestedJars;
 import dev.equo.solstice.ShimIdeBootstrapServices;
@@ -47,6 +48,23 @@
 
 /** 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");
+	}
+
 	/**
 	 * Groovy compiler problems can be ignored.
 	 * <p>
@@ -59,16 +77,6 @@ public class GrEclipseFormatterStepImpl {
 	private final boolean ignoreFormatterProblems;
 
 	public GrEclipseFormatterStepImpl(final Properties properties) throws Exception {
-		var solstice = Solstice.findBundlesOnClasspath();
-		NestedJars.setToWarnOnly();
-		NestedJars.onClassPath().confirmAllNestedJarsArePresentOnClasspath(CacheLocations.nestedJars());
-		solstice.warnAndModifyManifestsToFix();
-		var props = Map.<String, String> of();
-		solstice.openShim(props);
-		ShimIdeBootstrapServices.apply(props, solstice.getContext());
-		solstice.startAllWithLazy(false);
-		solstice.startWithoutTransitives("org.codehaus.groovy.eclipse.core");
-
 		PreferenceStore preferences = createPreferences(properties);
 		preferencesStore = new FormatterPreferencesOnStore(preferences);
 		ignoreFormatterProblems = Boolean.parseBoolean(properties.getProperty(IGNORE_FORMATTER_PROBLEMS, "false"));

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

@@ -18,6 +18,7 @@
 import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 
 import com.diffplug.spotless.FileSignature;
@@ -65,12 +66,31 @@ public FormatterStep build() {
 
 	protected abstract P2Model model(String version);
 
+	protected void addPlatformRepo(P2Model model, String version) {
+		if (!version.startsWith("4.")) {
+			throw new IllegalArgumentException("Expected 4.x");
+		}
+		int minorVersion = Integer.parseInt(version.substring("4.".length()));
+
+		model.addP2Repo("https://download.eclipse.org/eclipse/updates/" + version + "/");
+		model.getInstall().addAll(List.of(
+				"org.apache.felix.scr",
+				"org.eclipse.equinox.event"));
+		if (minorVersion >= 25) {
+			model.getInstall().addAll(List.of(
+					"org.osgi.service.cm",
+					"org.osgi.service.metatype"));
+		}
+	}
+
 	/** Creates the state of the configuration. */
 	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("com.diffplug.durian:durian-swt.os:4.1.1");
+		mavenDeps.add("org.slf4j:slf4j-simple:1.7.36");
 		mavenDeps.addAll(query.getJarsOnMavenCentral());
 		classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));
 		classpath.addAll(query.getJarsNotOnMavenCentral());

lib-extra/src/main/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStep.java

@@ -57,13 +57,16 @@ protected P2Model model(String version) {
 					greclipseVersion = "3." + (eVersion - 8) + ".0";
 				}
 				var model = new P2Model();
-				model.addP2Repo("https://download.eclipse.org/eclipse/updates/" + version + "/");
+				addPlatformRepo(model, version);
 				model.addP2Repo("https://groovy.jfrog.io/artifactory/plugins-release/org/codehaus/groovy/groovy-eclipse-integration/" + greclipseVersion + "/e" + version + "/");
 				model.getInstall().addAll(List.of(
 						"org.codehaus.groovy.eclipse.refactoring",
 						"org.codehaus.groovy.eclipse.core",
 						"org.eclipse.jdt.groovy.core",
 						"org.codehaus.groovy"));
+				model.addFilterAndValidate("no-debug", filter -> {
+					filter.exclude("org.eclipse.jdt.debug");
+				});
 				return model;
 			}
 

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

@@ -42,7 +42,7 @@ public static EquoBasedStepBuilder createBuilder(Provisioner provisioner) {
 			@Override
 			protected P2Model model(String version) {
 				var model = new P2Model();
-				model.addP2Repo("https://download.eclipse.org/eclipse/updates/" + version + "/");
+				addPlatformRepo(model, version);
 				model.getInstall().add("org.eclipse.jdt.core");
 				return model;
 			}
@@ -51,7 +51,7 @@ protected P2Model model(String version) {
 			public void setVersion(String version) {
 				if (version.endsWith(".0")) {
 					String newVersion = version.substring(0, version.length() - 2);
-					System.err.println("Recommend replacing '" + version + "' with '" + newVersion + "' for eclipse JDT");
+					System.err.println("Recommend replacing '" + version + "' with '" + newVersion + "' for Eclipse JDT");
 					version = newVersion;
 				}
 				super.setVersion(version);

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

@@ -38,6 +38,6 @@ void formatWithVersion(String version) throws Exception {
 	}
 
 	private static Stream<String> formatWithVersion() {
-		return Stream.of("4.25", GrEclipseFormatterStep.defaultVersion());
+		return Stream.of("4.21", GrEclipseFormatterStep.defaultVersion());
 	}
 }