Merge remote-tracking branch 'upstream/main' into issue-1741-ktlint-update-0.50.0

# Conflicts:
#	plugin-gradle/CHANGES.md

Author: magneticflux-

plugin-gradle/CHANGES.md

@@ -7,6 +7,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Bump default `ktlint` version to latest `0.49.1` -> `0.50.0`. ([#1741](https://github.com/diffplug/spotless/issues/1741))
   * Dropped support for `ktlint 0.47.x` following our policy of supporting two breaking changes at a time.
   * Dropped support for deprecated `useExperimental` parameter in favor of the `ktlint_experimental` property.
+* Add an overload for `FormatExtension.addStep` which provides access to the `FormatExtension`'s `Provisioner`, enabling custom steps to make use of third-party dependencies.
 ### Fixed
 * Correctly support the syntax
   ```

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java

@@ -30,6 +30,7 @@
 import java.util.Random;
 import java.util.TreeMap;
 import java.util.function.Consumer;
+import java.util.function.Function;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -300,6 +301,13 @@ public void addStep(FormatterStep newStep) {
 		steps.add(newStep);
 	}
 
+	/** Adds a new step that requires a Provisioner. */
+	public void addStep(Function<Provisioner, FormatterStep> createStepFn) {
+		requireNonNull(createStepFn);
+		FormatterStep newStep = createStepFn.apply(provisioner());
+		addStep(newStep);
+	}
+
 	/** Returns the index of the existing step with the given name, or -1 if no such step exists. */
 	protected int getExistingStepIdx(String stepName) {
 		for (int i = 0; i < steps.size(); ++i) {