feat: allow dynamic version selection for clean-that

Author: simschla

README.md

@@ -248,16 +248,6 @@ spotless --target '**/src/**/*.cpp' clang-format --clang-version=20.1.2 --style=
 
 ### clean-that
 
-<!---freshmark ctshields
-output = [
-  link(shield('CleanThat version', 'clean-that', '{{libs.versions.native.include.cleanThat}}', 'blue'), 'https://github.com/solven-eu/cleanthat'),
-  ].join('\n')
--->
-
-[![CleanThat version](https://img.shields.io/badge/clean--that-2.23-blue.svg)](https://github.com/solven-eu/cleanthat)
-
-<!---freshmark /ctshields -->
-
 Cleanthat is a project enabling automatic code cleaning, from formatting to refactoring.
 
 To see usage instructions for the clean-that formatter, run: `spotless clean-that --help`
@@ -270,8 +260,9 @@ output =
 -->
 
 ```
-Usage: spotless clean-that [-dDhV] [-s=<sourceCompatibility>] [-a[=mutator[,
-                           mutator...]...]]... [-e[=mutator[,mutator...]...]]...
+Usage: spotless clean-that [-dDhV] [-s=<sourceCompatibility>] [-v=<useVersion>]
+                           [-a[=mutator[,mutator...]...]]... [-e[=mutator[,
+                           mutator...]...]]...
 CleanThat enables automatic refactoring of Java code.
   -a, --add-mutator[=mutator[,mutator...]...]
                   Add a mutator to the list of mutators to use. Mutators are
@@ -296,6 +287,9 @@ CleanThat enables automatic refactoring of Java code.
                     This is used to determine the Java language features
                     available.
                   (default: 1.8)
+  -v, --use-version=<useVersion>
+                  The version of CleanThat to use.
+                  (default: 2.24)
   -V, --version   Print version information and exit.
 
 ✅ This step supports the following file type: Java

app/src/main/java/com/diffplug/spotless/cli/steps/CleanThat.java

@@ -41,9 +41,12 @@ public class CleanThat extends SpotlessFormatterStep {
 
     public static final String DEFAULT_MUTATORS = String.join(", ", CleanthatJavaStep.defaultMutators());
 
+    private static final String DEFAULT_VERSION_SYSPROP = "steps.clean-that.default-version";
+
     static {
         // workaround for dynamic property resolution in help messages
         System.setProperty("usage.cleanthat.defaultMutators", DEFAULT_MUTATORS);
+        System.setProperty(DEFAULT_VERSION_SYSPROP, CleanthatJavaStep.defaultVersion());
     }
 
     @CommandLine.Option(
@@ -88,11 +91,17 @@ public class CleanThat extends SpotlessFormatterStep {
                             + OptionConstants.DEFAULT_VALUE_SUFFIX)
     String sourceCompatibility;
 
+    @CommandLine.Option(
+            names = {"--use-version", "-v"},
+            defaultValue = "${sys:" + DEFAULT_VERSION_SYSPROP + "}",
+            description = "The version of CleanThat to use." + OptionConstants.DEFAULT_VALUE_SUFFIX)
+    String useVersion;
+
     @Override
     public @NotNull List<FormatterStep> prepareFormatterSteps(SpotlessActionContext context) {
         return Collections.singletonList(CleanthatJavaStep.create(
                 CleanthatJavaStep.defaultGroupArtifact(),
-                CleanthatJavaStep.defaultVersion(),
+                useVersion,
                 this.sourceCompatibility,
                 includedMutators(),
                 excludedMutators(),

gradle/libs.versions.toml

@@ -7,7 +7,6 @@ durian = "1.2.0"
 junit = "5.8.1"
 maven-resolver = "2.0.13"
 mockito = "5.17.0"
-native-include-cleanThat = "2.23"
 # to find required version here check eclipse_wtp_formatter/v4.21.0.lockfile
 # where <4.21.0> is the default version of com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep#defaultVersion
 native-include-spotlessEclipseWtp = "3.23.0"
@@ -37,7 +36,6 @@ maven-resolver-transport-apache = { module = "org.apache.maven.resolver:maven-re
 maven-resolver-transport-file = { module = "org.apache.maven.resolver:maven-resolver-transport-file" } # version from bom
 maven-resolver-util = { module = "org.apache.maven.resolver:maven-resolver-util" } # version from bom
 mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
-native-include-cleanThat = { module = "io.github.solven-eu.cleanthat:java", version.ref = "native-include-cleanThat" }
 native-include-spotlessEclipseWtp = { module = "com.diffplug.spotless:spotless-eclipse-wtp", version.ref = "native-include-spotlessEclipseWtp" }
 picocli = { module = "info.picocli:picocli", version.ref = "picocli" }
 picocli-codegen = { module = "info.picocli:picocli-codegen", version.ref = "picocli" }
@@ -61,7 +59,6 @@ maven-resolver-impl-libs = [
     "maven-resolver-supplier-mvn4",
 ]
 native-includes = [
-    "native-include-cleanThat",
     "native-include-spotlessEclipseWtp",
 ]
 spotless-libs = ["spotless-lib", "spotless-lib-extra"]