Use ConcurrentUtil from Paper repo and use release of YamlConfig

Tuinity · Dec 4, 2024 · 9b1adfd · 9b1adfd
1 parent 9149ac9
commit 9b1adfd
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 19 deletions.
diff --git 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
@@ -1,3 +0,0 @@
-[submodule "ConcurrentUtil"]
-	path = ConcurrentUtil
-	url = https://github.com/Spottedleaf/ConcurrentUtil.git

diff --git a/ConcurrentUtil b/ConcurrentUtil
diff --git 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
@@ -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
diff --git 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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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