Use libraries from Paper repo (#82)
* Use YamlConfig from Paper repo * Add comment to settings * Use ConcurrentUtil from Paper repo and use release of YamlConfig * Use ConcurrentUtil release
This commit is contained in:
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -31,8 +31,6 @@ jobs:
|
|||||||
key: ${{ runner.os }}-project-local-gradle-caches-${{ hashFiles('**/libs.versions.toml', '**/*.gradle*', '**/gradle-wrapper.properties') }}
|
key: ${{ runner.os }}-project-local-gradle-caches-${{ hashFiles('**/libs.versions.toml', '**/*.gradle*', '**/gradle-wrapper.properties') }}
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
${{ runner.os }}-project-local-gradle-caches-
|
${{ runner.os }}-project-local-gradle-caches-
|
||||||
- name: "setup dependencies"
|
|
||||||
run: ./install_deps.sh
|
|
||||||
- name: "execute gradle build"
|
- name: "execute gradle build"
|
||||||
run: ./gradlew build
|
run: ./gradlew build
|
||||||
- name: Determine Snapshot Status
|
- name: Determine Snapshot Status
|
||||||
|
|||||||
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -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
|
|
||||||
|
|||||||
Submodule ConcurrentUtil deleted from 08d3ca3241
Submodule YamlConfig deleted from 67552e7707
@@ -67,10 +67,10 @@ allprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenLocal {
|
maven {
|
||||||
|
url "https://repo.papermc.io/repository/maven-public/"
|
||||||
mavenContent {
|
mavenContent {
|
||||||
includeModule("ca.spottedleaf", "concurrentutil")
|
includeGroup("ca.spottedleaf")
|
||||||
includeModule("ca.spottedleaf", "yamlconfig")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
|
|||||||
@@ -11,8 +11,8 @@ neoforge_version=21.4.0-beta
|
|||||||
neoform_version=1.21.4-20241203.161809
|
neoform_version=1.21.4-20241203.161809
|
||||||
fabric_api_version=0.110.5+1.21.4
|
fabric_api_version=0.110.5+1.21.4
|
||||||
snakeyaml_version=2.3
|
snakeyaml_version=2.3
|
||||||
concurrentutil_version=0.0.2-SNAPSHOT
|
concurrentutil_version=0.0.2
|
||||||
yamlconfig_version=1.0.2-SNAPSHOT
|
yamlconfig_version=1.0.2
|
||||||
cloth_version=16.0.141
|
cloth_version=16.0.141
|
||||||
modmenu_version=13.0.0-beta.1
|
modmenu_version=13.0.0-beta.1
|
||||||
junit_version=5.11.3
|
junit_version=5.11.3
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -eou pipefail
|
|
||||||
|
|
||||||
git submodule update --init --recursive
|
|
||||||
|
|
||||||
cd ConcurrentUtil
|
|
||||||
mvn install
|
|
||||||
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
cd YamlConfig
|
|
||||||
mvn install
|
|
||||||
@@ -48,3 +48,6 @@ include("fabric")
|
|||||||
findProject(":fabric").name = "Moonrise-Fabric"
|
findProject(":fabric").name = "Moonrise-Fabric"
|
||||||
include("neoforge")
|
include("neoforge")
|
||||||
findProject(":neoforge").name = "Moonrise-NeoForge"
|
findProject(":neoforge").name = "Moonrise-NeoForge"
|
||||||
|
|
||||||
|
// includeBuild("../YamlConfig") // Uncomment to use local YamlConfig
|
||||||
|
// includeBuild("../ConcurrentUtil") // Uncomment to use local ConcurrentUtil
|
||||||
|
|||||||
Reference in New Issue
Block a user