Fix gradle properties not being read from sub projects correctly. (#941)

Workaround gradle/gradle#23572
FabricMC · Aug 10, 2023 · ffc786d · ffc786d
1 parent cfe72b9
commit ffc786d
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/main/java/net/fabricmc/loom/util/gradle/GradleUtils.java b/src/main/java/net/fabricmc/loom/util/gradle/GradleUtils.java
@@ -59,10 +59,17 @@ public static boolean isLoomProject(Project project) {
 	}
 
 	public static Provider<Boolean> getBooleanPropertyProvider(Project project, String key) {
-		return project.getProviders().gradleProperty(key).map(string -> {
-			try {
-				return Boolean.parseBoolean(string);
-			} catch (final IllegalArgumentException ex) {
+		// Works around https://github.com/gradle/gradle/issues/23572
+		return project.provider(() -> {
+			final Object value = project.findProperty(key);
+
+			if (value instanceof String str) {
+				try {
+					return Boolean.parseBoolean(str);
+				} catch (final IllegalArgumentException ex) {
+					return false;
+				}
+			} else {
 				return false;
 			}
 		});