Remove the Spotless step for the native image

SpotlessInterop picked NativePalantirJavaFormatStep when the native
formatter was switched on and Gradle ran on a JVM older than 21. The
plugin is compiled for 21 and does not load on an older JVM, so the
branch never ran: Spotless formats on the Gradle JVM, as the docs say,
whatever openjavaformat.native.formatter is. The step, the version
check and the native configuration lookup go.

So does PalantirJavaFormatStep.create(Configuration, Supplier),
deprecated when the step stopped using the supplier; nothing calls it.

Author: abashev

gradle-open-java-format/src/main/java/com/palantir/javaformat/gradle/SpotlessInterop.java

@@ -17,22 +17,19 @@
 
 import com.diffplug.gradle.spotless.JavaExtension;
 import com.diffplug.spotless.FormatterStep;
-import com.palantir.javaformat.gradle.spotless.NativePalantirJavaFormatStep;
 import com.palantir.javaformat.gradle.spotless.PalantirJavaFormatStep;
 import java.io.File;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.regex.Pattern;
 import javax.inject.Inject;
 import org.gradle.api.Action;
-import org.gradle.api.JavaVersion;
 import org.gradle.api.artifacts.ConfigurationContainer;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
 import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.specs.Spec;
-import org.gradle.api.tasks.Nested;
 import org.gradle.api.tasks.SourceSetContainer;
 
 /**
@@ -56,9 +53,6 @@ public abstract class SpotlessInterop implements Action<JavaExtension> {
     private final File projectDir;
     private final SourceSetContainer sourceSets;
 
-    @Nested
-    protected abstract NativeImageSupport getNativeImageSupport();
-
     @Inject
     protected abstract ConfigurationContainer getConfigurations();
 
@@ -90,14 +84,12 @@ private FileCollection generatedSources() {
                 .toList());
     }
 
+    /**
+     * The Java-based formatter, on the Gradle JVM, whether or not {@code openjavaformat.native.formatter} is set: the
+     * property is about formatDiff, and Spotless has no native step.
+     */
     private FormatterStep spotlessJavaFormatStep() {
-        if (getNativeImageSupport().isNativeImageConfigured()
-                && JavaVersion.current().compareTo(JavaVersion.VERSION_21) < 0) {
-            logger.info("Using the native-image formatter");
-            return NativePalantirJavaFormatStep.create(
-                    getConfigurations().getByName(NativeImageFormatProviderPlugin.NATIVE_CONFIGURATION_NAME));
-        }
-        logger.info("Using the Java-based formatter {}", JavaVersion.current());
+        logger.info("Using the Java-based formatter");
         return PalantirJavaFormatStep.create(
                 getConfigurations().getByName(PalantirJavaFormatProviderPlugin.CONFIGURATION_NAME));
     }

gradle-open-java-format/src/main/java/com/palantir/javaformat/gradle/spotless/NativePalantirJavaFormatStep.java

@@ -18,10 +18,8 @@
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
-import com.google.errorprone.annotations.InlineMe;
 import com.palantir.javaformat.gradle.FormatterServiceLoader;
 import com.palantir.javaformat.java.FormatterService;
-import java.util.function.Supplier;
 import org.gradle.api.artifacts.Configuration;
 
 public final class PalantirJavaFormatStep {
@@ -47,19 +45,6 @@ public static FormatterStep create(Configuration palantirJavaFormat) {
                 PalantirJavaFormatStep::createFormat);
     }
 
-    /**
-     * Creates the same step as {@link #create(Configuration)}.
-     *
-     * @deprecated the step loads the formatter from the configuration's jars, and ignores {@code memoizedService}.
-     */
-    @Deprecated
-    @InlineMe(
-            replacement = "PalantirJavaFormatStep.create(palantirJavaFormat)",
-            imports = "com.palantir.javaformat.gradle.spotless.PalantirJavaFormatStep")
-    public static FormatterStep create(Configuration palantirJavaFormat, Supplier<FormatterService> memoizedService) {
-        return create(palantirJavaFormat);
-    }
-
     private static FormatterFunc createFormat(FileSignature jars) {
         FormatterService formatter = FormatterServiceLoader.load(jars.files());
         return formatter::formatSourceReflowStringsAndFixImports;

gradle-open-java-format/src/main/java/com/palantir/javaformat/gradle/spotless/PalantirJavaFormatStep.java

@@ -51,11 +51,7 @@ final class PalantirJavaFormatSpotlessPluginTest {
     @TempDir
     private Path projectDir;
 
-    // There used to be a third case — native.formatter=true on Java 17, expecting the native-image
-    // formatter. SpotlessInterop only picks the native image when JavaVersion.current() < 21, and the
-    // generated build's daemon used to be forced onto 17 by palantir/gradle-jdks. Without that plugin
-    // TestKit runs the generated build on the same JVM as the test, so the case could only ever assert
-    // the Java-based path. Restoring it means pointing org.gradle.java.home at a JDK below 21.
+    // native.formatter=true too formats on the Gradle JVM: Spotless has no native step.
     @ParameterizedTest
     @CsvSource(
             delimiter = '|',