diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 4867397a3..a0f8703aa 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -16,11 +16,11 @@ repositories { dependencies { //TODO Allow pulling from Versions.kt - implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.1") + implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.6") - implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "2.0.0-beta.16") - implementation("org.ow2.asm", "asm", "9.7") - implementation("org.ow2.asm", "asm-tree", "9.7") + implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "2.0.0-beta.17") + implementation("org.ow2.asm", "asm", "9.8") + implementation("org.ow2.asm", "asm-tree", "9.8") implementation("com.dfsek.tectonic", "common", "4.2.1") - implementation("org.yaml", "snakeyaml", "2.3") + implementation("org.yaml", "snakeyaml", "2.4") } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 3413e4365..b971af8c7 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -10,26 +10,26 @@ object Versions { const val cloud = "2.0.0" - const val caffeine = "3.1.8" + const val caffeine = "3.2.0" - const val slf4j = "2.0.16" + const val slf4j = "2.0.17" object Internal { - const val shadow = "8.3.3" - const val apacheText = "1.12.0" - const val apacheIO = "2.17.0" - const val guava = "33.3.1-jre" - const val asm = "9.7.1" - const val snakeYml = "2.3" - const val jetBrainsAnnotations = "26.0.1" - const val junit = "5.11.3" + const val shadow = "8.3.6" + const val apacheText = "1.13.1" + const val apacheIO = "2.19.0" + const val guava = "33.4.8-jre" + const val asm = "9.8" + const val snakeYml = "2.4" + const val jetBrainsAnnotations = "26.0.2" + const val junit = "5.13.0" const val nbt = "6.1" } } object Fabric { - const val fabricAPI = "0.119.5+${Mod.minecraft}" - const val cloud = "2.0.0-beta.9" + const val fabricAPI = "0.125.3+${Mod.minecraft}" + const val cloud = "2.0.0-beta.10" } // // object Quilt { @@ -38,13 +38,13 @@ object Versions { // } object Mod { - const val mixin = "0.15.3+mixin.0.8.7" + const val mixin = "0.15.5+mixin.0.8.7" const val minecraft = "1.21.5" const val yarn = "$minecraft+build.1" - const val fabricLoader = "0.16.10" + const val fabricLoader = "0.16.14" - const val architecuryLoom = "1.10.430" + const val architecuryLoom = "1.10.431" const val architecturyPlugin = "3.4.161" } @@ -55,14 +55,14 @@ object Versions { // } object Bukkit { - const val minecraft = "1.21.5" - const val paperBuild = "$minecraft-no-moonrise-20250327.171130-4" + const val minecraft = "1.21.5-R0.1" + const val paperBuild = "$minecraft-20250529.121722-14" const val paper = paperBuild const val paperLib = "1.0.8" - const val reflectionRemapper = "0.1.1" - const val paperDevBundle = "$minecraft-no-moonrise-20250327.171130-3" + const val reflectionRemapper = "0.1.2" + const val paperDevBundle = "$minecraft-20250529.121722-99" const val runPaper = "2.3.1" - const val paperWeight = "2.0.0-beta.16" + const val paperWeight = "2.0.0-beta.17" const val cloud = "2.0.0-beta.10" } @@ -74,13 +74,13 @@ object Versions { // } // object CLI { - const val logback = "1.5.8" - const val picocli = "4.7.6" + const val logback = "1.5.18" + const val picocli = "4.7.7" } object Allay { const val api = "0.2.0" - const val gson = "2.12.1" + const val gson = "2.13.1" const val mappings = "3626653" const val mappingsGenerator = "366618e" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b953..1b33c55ba 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e1b837a19..9128c7d42 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d6..23d15a936 100755 --- a/gradlew +++ b/gradlew @@ -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 @@ -115,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. @@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a2183..db3a6ac20 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell