From 9b1adfd3be90c95d4bba184706c5d8420213d967 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Tue, 3 Dec 2024 19:44:47 -0700
Subject: [PATCH] Use ConcurrentUtil from Paper repo and use release of
 YamlConfig

---
 .github/workflows/build.yml | 2 --
 .gitmodules                 | 3 ---
 ConcurrentUtil              | 1 -
 build.gradle                | 5 -----
 gradle.properties           | 2 +-
 install_deps.sh             | 7 -------
 settings.gradle             | 1 +
 7 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 160000 ConcurrentUtil
 delete mode 100755 install_deps.sh

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1a776b60..43eb9ecb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,8 +31,6 @@ jobs:
           key: ${{ runner.os }}-project-local-gradle-caches-${{ hashFiles('**/libs.versions.toml', '**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-project-local-gradle-caches-
-      - name: "setup dependencies"
-        run: ./install_deps.sh
       - name: "execute gradle build"
         run: ./gradlew build
       - name: Determine Snapshot Status
diff --git a/.gitmodules b/.gitmodules
index 32ac5cda..e69de29b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "ConcurrentUtil"]
-	path = ConcurrentUtil
-	url = https://github.com/Spottedleaf/ConcurrentUtil.git
diff --git a/ConcurrentUtil b/ConcurrentUtil
deleted file mode 160000
index 08d3ca32..00000000
--- a/ConcurrentUtil
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 08d3ca3241084c045d9dfe407b699cd4503ffbc7
diff --git a/build.gradle b/build.gradle
index 81111037..7228d670 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,11 +67,6 @@ allprojects {
     }
 
     repositories {
-        mavenLocal {
-            mavenContent {
-                includeModule("ca.spottedleaf", "concurrentutil")
-            }
-        }
         maven {
             url "https://repo.papermc.io/repository/maven-public/"
             mavenContent {
diff --git a/gradle.properties b/gradle.properties
index 387ea377..7a22aaae 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,7 @@ neoform_version=1.21.4-20241203.161809
 fabric_api_version=0.110.5+1.21.4
 snakeyaml_version=2.3
 concurrentutil_version=0.0.2-SNAPSHOT
-yamlconfig_version=1.0.2-SNAPSHOT
+yamlconfig_version=1.0.2
 cloth_version=16.0.141
 modmenu_version=13.0.0-beta.1
 junit_version=5.11.3
diff --git a/install_deps.sh b/install_deps.sh
deleted file mode 100755
index 4733acbe..00000000
--- a/install_deps.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -eou pipefail
-
-git submodule update --init --recursive
-
-cd ConcurrentUtil
-mvn install
diff --git a/settings.gradle b/settings.gradle
index 086e9a96..528e1210 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -50,3 +50,4 @@ include("neoforge")
 findProject(":neoforge").name = "Moonrise-NeoForge"
 
 // includeBuild("../YamlConfig") // Uncomment to use local YamlConfig
+// includeBuild("../ConcurrentUtil") // Uncomment to use local ConcurrentUtil