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 e3fe8b2b..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +0,0 @@ -[submodule "ConcurrentUtil"] - path = ConcurrentUtil - url = https://github.com/Spottedleaf/ConcurrentUtil.git -[submodule "YamlConfig"] - path = YamlConfig - url = https://github.com/Spottedleaf/YamlConfig.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/YamlConfig b/YamlConfig deleted file mode 160000 index 67552e77..00000000 --- a/YamlConfig +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 67552e770799734372260ffde9ea33aa10d291c8 diff --git a/build.gradle b/build.gradle index f9a984b0..7228d670 100644 --- a/build.gradle +++ b/build.gradle @@ -67,10 +67,10 @@ allprojects { } repositories { - mavenLocal { + maven { + url "https://repo.papermc.io/repository/maven-public/" mavenContent { - includeModule("ca.spottedleaf", "concurrentutil") - includeModule("ca.spottedleaf", "yamlconfig") + includeGroup("ca.spottedleaf") } } maven { diff --git a/gradle.properties b/gradle.properties index 387ea377..a9c776aa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,8 +11,8 @@ neoforge_version=21.4.0-beta 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 +concurrentutil_version=0.0.2 +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 1a8459ed..00000000 --- a/install_deps.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -set -eou pipefail - -git submodule update --init --recursive - -cd ConcurrentUtil -mvn install - -cd .. - -cd YamlConfig -mvn install diff --git a/settings.gradle b/settings.gradle index 0b50d854..528e1210 100644 --- a/settings.gradle +++ b/settings.gradle @@ -48,3 +48,6 @@ include("fabric") findProject(":fabric").name = "Moonrise-Fabric" include("neoforge") findProject(":neoforge").name = "Moonrise-NeoForge" + +// includeBuild("../YamlConfig") // Uncomment to use local YamlConfig +// includeBuild("../ConcurrentUtil") // Uncomment to use local ConcurrentUtil