From 2c1e036857e227dae74a72ca480f614757218784 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Wed, 2 Aug 2023 14:59:52 -0400
Subject: [PATCH 1/2] Bail out early if empty map is passed to
 CanonizingStringMap.putAll

---
 .../java/org/embeddedt/modernfix/util/CanonizingStringMap.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/src/main/java/org/embeddedt/modernfix/util/CanonizingStringMap.java b/common/src/main/java/org/embeddedt/modernfix/util/CanonizingStringMap.java
index 352492b1..845fbb1e 100644
--- a/common/src/main/java/org/embeddedt/modernfix/util/CanonizingStringMap.java
+++ b/common/src/main/java/org/embeddedt/modernfix/util/CanonizingStringMap.java
@@ -29,6 +29,8 @@ public class CanonizingStringMap<T> extends HashMap<String, T> {
 
     @Override
     public void putAll(Map<? extends String, ? extends T> m) {
+        if(m.isEmpty())
+            return;
         HashMap<String, T> tmp = new HashMap<>();
         m.forEach((k, v) -> tmp.put(intern(k), v));
         super.putAll(tmp);

From 62ea11ef7baae2e8f10245c7478dde4e204cd6c4 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Wed, 2 Aug 2023 15:32:59 -0400
Subject: [PATCH 2/2] Avoid hardcoding projects to include

---
 settings.gradle | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 4afff011..739e778f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,7 +9,9 @@ pluginManagement {
 
 include("test_agent")
 include("common")
-include("fabric")
-include("forge")
+
+getProperty("enabled_platforms").tokenize(',').each { it ->
+    include(it.trim())
+}
 
 rootProject.name = 'modernfix'