Skip to content

Commit e398c35

Browse files
committed
Yup, custom still needs Gradle 8.0+, bring that back.
1 parent 168e597 commit e398c35

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
package com.diffplug.gradle.spotless;
1717

1818
import static com.diffplug.gradle.spotless.PluginGradlePreconditions.requireElementsNonNull;
19+
import static com.diffplug.gradle.spotless.SpotlessPluginRedirect.badSemver;
20+
import static com.diffplug.gradle.spotless.SpotlessPluginRedirect.badSemverOfGradle;
1921
import static java.util.Objects.requireNonNull;
2022

2123
import java.io.File;
@@ -44,6 +46,7 @@
4446
import org.gradle.api.file.FileCollection;
4547
import org.gradle.api.plugins.BasePlugin;
4648
import org.gradle.api.tasks.TaskProvider;
49+
import org.gradle.util.GradleVersion;
4750
import org.slf4j.Logger;
4851
import org.slf4j.LoggerFactory;
4952

@@ -484,6 +487,12 @@ private void readObject(java.io.ObjectInputStream stream) throws java.io.IOExcep
484487
*/
485488
public void custom(String name, FormatterFunc formatter) {
486489
requireNonNull(formatter, "formatter");
490+
if (badSemverOfGradle() < badSemver(SpotlessPlugin.VER_GRADLE_minVersionForCustom)) {
491+
throw new GradleException("The 'custom' method is only available if you are using Gradle "
492+
+ SpotlessPlugin.VER_GRADLE_minVersionForCustom
493+
+ " or newer, this is "
494+
+ GradleVersion.current().getVersion());
495+
}
487496
addStep(FormatterStep.createLazy(name, () -> globalState, SerializedFunction.alwaysReturns(formatter)));
488497
}
489498

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/BumpThisNumberIfACustomStepChangesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public GradleRunner gradleRunner() throws IOException {
4444
if (useConfigCache) {
4545
setFile("gradle.properties").toLines("org.gradle.unsafe.configuration-cache=true",
4646
"org.gradle.configuration-cache=true");
47-
return super.gradleRunner().withGradleVersion(GradleVersionSupport.CONFIGURATION_CACHE.version);
47+
return super.gradleRunner().withGradleVersion(GradleVersionSupport.CUSTOM_STEPS.version);
4848
} else {
4949
return super.gradleRunner();
5050
}

0 commit comments

Comments
 (0)