Merge 1.20.4 into 1.20.5

2024-03-14 22:13:59 -04:00 · 2024-03-14 22:13:59 -04:00 · 826e5a4c20
commit 826e5a4c20
parent 4584457a79 a62c0635a5
1 changed files with 5 additions and 3 deletions
--- a/settings.gradle
+++ b/settings.gradle
@ -23,9 +23,11 @@ def current_platforms = getProperty("enabled_platforms").tokenize(',')
 current_platforms.each { it ->
    def platform_name = it.trim()
    include(platform_name)
-    def testmodFolder = new File(platform_name + "/" + "testmod")
-    if(testmodFolder.isDirectory()) {
-        include(platform_name + ":testmod")
+    if(hasProperty("modernfix.testmod.enable")) {
+        def testmodFolder = new File(platform_name + "/" + "testmod")
+        if (testmodFolder.isDirectory()) {
+            include(platform_name + ":testmod")
+        }
    }
 }