From 131e2577397f22a149fabc5bf6d0d7f0ea9c64ee Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Sat, 10 Sep 2022 20:04:13 -0500
Subject: [PATCH] Remove the commonInterface sub-project

---
 build.gradle    | 20 ++++----------------
 coreSubProjects |  2 +-
 settings.gradle |  2 --
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/build.gradle b/build.gradle
index f7f605aef..6c7322061 100644
--- a/build.gradle
+++ b/build.gradle
@@ -132,7 +132,6 @@ forgix {
     }
 
     removeDuplicate "com.seibel.lod.core"
-    removeDuplicate "com.seibel.lod.api"
 }
 
 architectury {
@@ -142,7 +141,7 @@ architectury {
 subprojects { p ->
     
     // setup Architectury
-    if (p == project(":core") || p == project(":api") || p == project(":commonInterface"))
+    if (p == project(":core") || p == project(":api"))
     {
         apply plugin: "application"
         apply plugin: "org.spongepowered.gradle.vanilla" // Provides minecraft libraries
@@ -167,7 +166,7 @@ subprojects { p ->
     }
     
     // Set up the minecraft non-dependency for core sub-projects
-    if (p == project(":core") || p == project(":api") || p == project(":commonInterface"))
+    if (p == project(":core") || p == project(":api"))
     {
         minecraft {
             version("${rootProject.minecraft_version}")
@@ -220,9 +219,9 @@ subprojects { p ->
         //==========================//
 
         // Minecraft dependent sub-projects
-        if (p == project(":common") || p == project(":forge") || p == project(":fabric") || p == project(":commonInterface") || p == project(":api"))
+        if (p == project(":common") || p == project(":forge") || p == project(":fabric") || p == project(":api"))
         {
-            if (p != project(":commonInterface") && p != project(":api"))
+            if (p != project(":api"))
             {
                 // Add Minecraft
                 minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
@@ -247,17 +246,6 @@ subprojects { p ->
             }
         }
         
-        
-        
-        if (p == project(":fabric") || p == project(":forge") || p == project(":common")) {
-            customModule(project(":commonInterface")) {
-                // Remove Junit test libraries
-                exclude group: "org.junit.jupiter", module: "junit-jupiter"
-                exclude group: "org.junit.jupiter", module: "junit-jupiter-engine"
-                exclude group: "junit", module: "junit"
-            }
-        }
-        
     }
 
     // Allows the jar to run standalone
diff --git a/coreSubProjects b/coreSubProjects
index ba701eb01..d21e334e1 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit ba701eb014d8cd8f90c44b1d13591f46bd32fba1
+Subproject commit d21e334e15c30d5b9ea641c53648a8bc085f28fc
diff --git a/settings.gradle b/settings.gradle
index 1e4a622cb..52d4a6589 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -18,7 +18,5 @@ include("core")
 project(":core").projectDir = file('coreSubProjects/core')
 include("api")
 project(":api").projectDir = file('coreSubProjects/api')
-include("commonInterface")
-project(":commonInterface").projectDir = file('coreSubProjects/commonInterface')
 
 rootProject.name = "DistantHorizons"