Skip to content

Commit

Permalink
Use libraries from Paper repo (#82)
Browse files Browse the repository at this point in the history
* Use YamlConfig from Paper repo

* Add comment to settings

* Use ConcurrentUtil from Paper repo and use release of YamlConfig

* Use ConcurrentUtil release
  • Loading branch information
jpenilla authored Dec 4, 2024
1 parent bff8cae commit e917272
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 27 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion ConcurrentUtil
Submodule ConcurrentUtil deleted from 08d3ca
1 change: 0 additions & 1 deletion YamlConfig
Submodule YamlConfig deleted from 67552e
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions install_deps.sh

This file was deleted.

3 changes: 3 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit e917272

Please sign in to comment.