From ffc786d3cd4b6835196a3f8945d01119fcd0ac16 Mon Sep 17 00:00:00 2001
From: modmuss <modmuss50@gmail.com>
Date: Thu, 10 Aug 2023 16:46:25 +0100
Subject: [PATCH] Fix gradle properties not being read from sub projects
 correctly. (#941)

Workaround gradle/gradle#23572
---
 .../fabricmc/loom/util/gradle/GradleUtils.java    | 15 +++++++++++----
 1 file changed, 11 insertions(+), 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
index 7fd5d159..dbe91442 100644
--- 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 final class GradleUtils {
 	}
 
 	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;
 			}
 		});