Update eclipse configuration

Author: abashev

eclipse_plugin/build.gradle

@@ -14,32 +14,45 @@
 
 plugins {
     id 'java-library'
-    id 'dev.equo.p2deps' version '1.7.8'
-}
-
-p2deps {
-    into 'compileOnly', {
-        p2repo 'https://download.eclipse.org/releases/2020-09/202009161000/'
-
-        install 'org.eclipse.jdt.core'
-    }
 }
 
 dependencies {
+    // Was dev.equo.p2deps resolving these from an Eclipse p2 repository at configuration time:
+    // a network fetch on every configuration, and a parse of the metadata index of an entire
+    // Eclipse release — which now exceeds the JDK's JAXP entity-size limit and fails the build.
+    // Same bundles, from Maven Central, resolved like every other dependency. compileOnly because
+    // the host IDE provides them at runtime; MANIFEST.MF imports the packages without version
+    // ranges, so the versions here only have to satisfy the compiler.
+    compileOnly libs.eclipse.jdtCore
+    compileOnly libs.eclipse.jfaceText
+    compileOnly libs.eclipse.text
+
     implementation project(':palantir-java-format')
     implementation libs.jsr305
 }
 
+// The dependencies embedded in the plugin jar. Named once, so the manifest can list exactly what
+// was packaged rather than a guess at what the file names will be.
+def embeddedLibs = configurations.runtimeClasspath.filter { file ->
+    ['functionaljava', 'guava', 'palantir'].any { file.name.startsWith(it) }
+}
+
 tasks.named("jar", Jar) {
     archiveBaseName = 'palantir-java-format-eclipse-plugin'
+
     manifest {
         from 'src/main/resources/META-INF/MANIFEST.MF'
+        // Generated, not hardcoded. There used to be a rename() stripping versions off the
+        // embedded jars so their names would match a fixed Bundle-ClassPath, but its pattern only
+        // matched plain versions: on any build whose version comes from `git describe`
+        // (2.97.0-26-g9da6ae7.dirty) the rename silently did nothing and the manifest pointed at
+        // files that were not in the archive, so Eclipse could not load the plugin.
+        attributes('Bundle-ClassPath': embeddedLibs.elements.map { files ->
+            (['.'] + files.collect { "lib/${it.asFile.name}" }).join(',')
+        })
     }
-    // We embed some dependencies into the JAR file
-    from(configurations.runtimeClasspath) {
+
+    from(embeddedLibs) {
         into 'lib'
-        include('functionaljava*', 'guava*', 'palantir*')
-        // The libraries are listed without a version in the manifest
-        rename('(.*)-[0-9b.]+(\\.dirty|-jre)?\\.jar', '$1.jar')
     }
 }

eclipse_plugin/src/main/resources/META-INF/MANIFEST.MF

@@ -8,8 +8,3 @@ Import-Package: org.eclipse.jdt.core.dom,
  org.eclipse.jdt.core.formatter,
  org.eclipse.jface.text,
  org.eclipse.text.edits
-Bundle-ClassPath: .,
- lib/functionaljava.jar,
- lib/guava.jar,
- lib/palantir-java-format.jar,
- lib/palantir-java-format-spi.jar

gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/NativeImageSupport.java

@@ -16,7 +16,6 @@
 
 package com.palantir.javaformat.gradle;
 
-import com.palantir.platform.Architecture;
 import com.palantir.platform.GradleOperatingSystem;
 import com.palantir.platform.OperatingSystem;
 import javax.inject.Inject;
@@ -35,11 +34,15 @@ public boolean isNativeImageConfigured() {
         return isNativeFlagEnabled() && isNativeImageSupported();
     }
 
+    /**
+     * The platforms a native image is published for, and therefore the only ones where it can be
+     * resolved. macOS is supported on both architectures: the x86-64 image used to be excluded
+     * because nobody built it, and .github/workflows/ci.yml now does. Windows and musl are still
+     * absent for the same reason — no job produces them.
+     */
     private boolean isNativeImageSupported() {
         return getOs().getOperatingSystem()
-                .map(os -> os.equals(OperatingSystem.LINUX_GLIBC)
-                        || (os.equals(OperatingSystem.MACOS)
-                                && Architecture.get().equals(Architecture.AARCH64)))
+                .map(os -> os.equals(OperatingSystem.LINUX_GLIBC) || os.equals(OperatingSystem.MACOS))
                 .get();
     }
 

gradle/libs.versions.toml

@@ -3,6 +3,12 @@
 # updates it, which it could not do for versions.props.
 
 [libraries]
+# Eclipse bundles the plugin compiles against. compileOnly: at runtime the host IDE
+# provides them, and META-INF/MANIFEST.MF imports the packages without version ranges.
+# Versions here match Eclipse 2020-09, which is what the p2 repository used to resolve.
+eclipse-jdtCore = { module = "org.eclipse.jdt:org.eclipse.jdt.core", version = "3.23.0" }
+eclipse-jfaceText = { module = "org.eclipse.platform:org.eclipse.jface.text", version = "3.16.300" }
+eclipse-text = { module = "org.eclipse.platform:org.eclipse.text", version = "3.10.200" }
 jetbrainsAnnotations = { module = "org.jetbrains:annotations", version = "26.1.0" }
 # A platform, not a dependency: plugins (baseline) inject versionless JUnit artifacts such as
 # junit-platform-launcher, and versions.props used to supply their versions.