update paper and paperweight

This commit is contained in:
Jason Penilla 2024-12-21 01:06:32 -08:00
parent 02b90eff99
commit cf2774c33d
No known key found for this signature in database
GPG Key ID: 0E75A301420E48F8
9 changed files with 7 additions and 8 deletions

2
.gitignore vendored
View File

@ -7,7 +7,7 @@ build
/run
/fork-server/build.gradle.kts
/fork-server/src/vanilla
/fork-server/src/minecraft
/paper-server
/fork-api/build.gradle.kts
/paper-api

View File

@ -8,7 +8,7 @@ plugins {
paperweight {
upstreams.paper {
ref = "6e0c8776e67219ddc8e4e61364c8203d924fd23f"
ref = "1dc6ad1df07e018ee68d95464022285f27fff916"
patchFile {
path = "paper-server/build.gradle.kts"

View File

@ -19,7 +19,7 @@
}
}
}
@@ -169,7 +_,7 @@
@@ -174,7 +_,7 @@
tasks.withType<Javadoc> {
val options = options as StandardJavadocDocletOptions
@ -28,7 +28,7 @@
options.use()
options.isDocFilesSubDirs = true
options.links(
@@ -207,11 +_,11 @@
@@ -212,11 +_,11 @@
}
// workaround for https://github.com/gradle/gradle/issues/4046

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

3
gradlew vendored
View File

@ -86,8 +86,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum

@ -1 +1 @@
Subproject commit 1dc821a295e27845c9b666361993c666e741d600
Subproject commit e8ebbf2449eb294705d370d9485b26091c21f91b