From 542ae3e97922474ebcdb302b7ed2a402e148b9c9 Mon Sep 17 00:00:00 2001
From: Fury_Phoenix <64714532+Phoenix-Starlight@users.noreply.github.com>
Date: Thu, 14 Dec 2023 14:16:34 -0800
Subject: [PATCH] Fix property substitution

---
 annotation-processor/build.gradle | 4 ++--
 fabric/build.gradle               | 2 +-
 forge/build.gradle                | 2 +-
 settings.gradle                   | 7 +++++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/annotation-processor/build.gradle b/annotation-processor/build.gradle
index 05286a89..e01ae249 100644
--- a/annotation-processor/build.gradle
+++ b/annotation-processor/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "${rootProject.shadow_version}"
+    id "com.github.johnrengelman.shadow"
     id 'java-library'
     id 'com.diffplug.spotless'
 }
@@ -41,4 +41,4 @@ spotless {
         removeUnusedImports()
     }
 }
-version = '1.1.1'
+version = '1.1.2'
diff --git a/fabric/build.gradle b/fabric/build.gradle
index bde01797..c2047731 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "${rootProject.shadow_version}"
+    id "com.github.johnrengelman.shadow"
     id 'com.adarshr.test-logger' version '3.2.0'
     id "modernfix.mod-common-conventions"
     id "modernfix.platform-conventions"
diff --git a/forge/build.gradle b/forge/build.gradle
index c064f561..ea515fab 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "${rootProject.shadow_version}"
+    id "com.github.johnrengelman.shadow"
     id "modernfix.mod-common-conventions"
     id "modernfix.platform-conventions"
 }
diff --git a/settings.gradle b/settings.gradle
index 3e6ed6b6..6a137b83 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,6 +5,13 @@ pluginManagement {
         maven { url "https://maven.architectury.dev/" }
         maven { url "https://maven.minecraftforge.net/" }
     }
+    resolutionStrategy {
+            eachPlugin {
+                if (requested.id.id == "com.github.johnrengelman.shadow") {
+                    useModule("gradle.plugin.com.github.johnrengelman:shadow:${shadow_version}")
+                }
+            }
+    }
 }
 
 include("annotation-processor")