Add compatibility utils for Gradle properties

Author: simonlebras

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

@@ -630,11 +630,7 @@ public LicenseHeaderConfig updateYearWithLatest(boolean updateYearWithLatest) {
 
 		FormatterStep createStep() {
 			return builder.withYearModeLazy(() -> {
-				if (spotless.project
-						.getProviders()
-						.gradleProperty(LicenseHeaderStep.FLAG_SET_LICENSE_HEADER_YEARS_FROM_GIT_HISTORY())
-						.map(Boolean::parseBoolean)
-						.getOrElse(false)) {
+				if (Boolean.parseBoolean(GradleCompat.findOptionalProperty(spotless.project, LicenseHeaderStep.FLAG_SET_LICENSE_HEADER_YEARS_FROM_GIT_HISTORY()))) {
 					return YearMode.SET_FROM_GIT;
 				} else {
 					boolean updateYear = updateYearWithLatest == null ? getRatchetFrom() != null : updateYearWithLatest;

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

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.gradle.spotless;
+
+import javax.annotation.Nullable;
+
+import org.gradle.api.Project;
+
+public final class GradleCompat {
+	private GradleCompat() {}
+
+	@Nullable public static String findOptionalProperty(Project project, String propertyName) {
+		@Nullable String value = project.getProviders().gradleProperty(propertyName).getOrNull();
+		if (value != null) {
+			return value;
+		}
+		@Nullable Object property = project.findProperty(propertyName);
+		if (property != null) {
+			return property.toString();
+		}
+		return null;
+	}
+
+	public static boolean isPropertyPresent(Project project, String propertyName) {
+		return project.getProviders().gradleProperty(propertyName).isPresent() ||
+				project.hasProperty(propertyName);
+	}
+}

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

@@ -22,7 +22,6 @@
 import javax.annotation.Nullable;
 
 import org.gradle.api.Project;
-import org.gradle.api.provider.ProviderFactory;
 
 import com.diffplug.common.base.Errors;
 import com.diffplug.common.io.ByteStreams;
@@ -37,11 +36,10 @@ static class State extends NoLambda.EqualityBasedOnSerialization {
 		final boolean useStdOut;
 
 		State(Project project) {
-			ProviderFactory providers = project.getProviders();
-			path = providers.gradleProperty(PROPERTY).getOrNull();
+			path = GradleCompat.findOptionalProperty(project, PROPERTY);
 			if (path != null) {
-				useStdIn = providers.gradleProperty(USE_STD_IN).isPresent();
-				useStdOut = providers.gradleProperty(USE_STD_OUT).isPresent();
+				useStdIn = GradleCompat.isPropertyPresent(project, USE_STD_IN);
+				useStdOut = GradleCompat.isPropertyPresent(project, USE_STD_OUT);
 			} else {
 				useStdIn = false;
 				useStdOut = false;

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

@@ -15,16 +15,11 @@
  */
 package com.diffplug.gradle.spotless;
 
-import java.lang.reflect.Method;
-
-import javax.annotation.Nonnull;
-
 import org.gradle.api.GradleException;
 import org.gradle.api.JavaVersion;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.plugins.BasePlugin;
-import org.gradle.api.provider.Provider;
 import org.gradle.util.GradleVersion;
 
 import com.diffplug.spotless.Jvm;
@@ -47,8 +42,7 @@ public void apply(Project project) {
 					+ "https://docs.gradle.org/current/userguide/building_java_projects.html#sec:java_cross_compilation");
 		}
 		// if -PspotlessModern=true, then use the modern stuff instead of the legacy stuff
-		Provider<String> spotlessModernProperty = forUseAtConfigurationTime(project.getProviders().gradleProperty(SPOTLESS_MODERN));
-		if (spotlessModernProperty.isPresent()) {
+		if (GradleCompat.isPropertyPresent(project, SPOTLESS_MODERN)) {
 			project.getLogger().warn("'spotlessModern' has no effect as of Spotless 5.0, recommend removing it.");
 		}
 		// make sure there's a `clean` and a `check`
@@ -70,30 +64,4 @@ public void apply(Project project) {
 	static String capitalize(String input) {
 		return Character.toUpperCase(input.charAt(0)) + input.substring(1);
 	}
-
-	static Provider<String> forUseAtConfigurationTime(@Nonnull Provider<String> provider) {
-		if (isGradle73OrNewer() && !isGradle74OrNewer()) {
-			try {
-				// Use reflection to access the forUseAtConfigurationTime method as it was removed in Gradle 9.
-				Method method = Provider.class.getMethod("forUseAtConfigurationTime");
-				return (Provider<String>) method.invoke(provider);
-			} catch (Exception e) {
-				throw new RuntimeException("Failed to invoke forUseAtConfigurationTime via reflection", e);
-			}
-		} else {
-			return provider;
-		}
-	}
-
-	static boolean isGradle73OrNewer() {
-		return isGradleNewerThan("7.3");
-	}
-
-	static boolean isGradle74OrNewer() {
-		return isGradleNewerThan("7.4");
-	}
-
-	private static boolean isGradleNewerThan(String version) {
-		return GradleVersion.current().compareTo(GradleVersion.version(version)) >= 0;
-	}
 }