diff --git a/build.gradle.kts b/build.gradle.kts index c9b01a52c1..b1f7c4f838 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.gradle.api.tasks.testing.logging.TestLogEvent plugins { - id("io.papermc.paperweight.patcher") version "2.0.0-beta.18" + id("io.papermc.paperweight.patcher") version "2.0.0-beta.19" } paperweight { diff --git a/forky-api/build.gradle.kts.patch b/forky-api/build.gradle.kts.patch index feb907e2a2..1d0ff3fd0f 100644 --- a/forky-api/build.gradle.kts.patch +++ b/forky-api/build.gradle.kts.patch @@ -1,6 +1,6 @@ --- a/fork-api/build.gradle.kts +++ b/fork-api/build.gradle.kts -@@ -101,17 +_,21 @@ +@@ -102,17 +_,21 @@ java { srcDir(generatedDir) srcDir(file("../paper-api/src/main/java")) diff --git a/forky-server/build.gradle.kts.patch b/forky-server/build.gradle.kts.patch index ff61e2842a..464f1448da 100644 --- a/forky-server/build.gradle.kts.patch +++ b/forky-server/build.gradle.kts.patch @@ -1,6 +1,6 @@ --- a/fork-server/build.gradle.kts +++ b/fork-server/build.gradle.kts -@@ -35,7 +_,22 @@ +@@ -31,7 +_,22 @@ } } @@ -24,7 +24,7 @@ spigot { enabled = true -@@ -122,10 +_,14 @@ +@@ -119,10 +_,14 @@ main { java { srcDir("../paper-server/src/main/java") } resources { srcDir("../paper-server/src/main/resources") } @@ -39,12 +39,12 @@ } } -@@ -153,7 +_,7 @@ +@@ -151,7 +_,7 @@ } dependencies { - implementation(project(":fork-api")) + implementation(project(":forky-api")) - implementation("ca.spottedleaf:concurrentutil:0.0.3") + implementation("ca.spottedleaf:concurrentutil:0.0.8") implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21 diff --git a/gradle.properties b/gradle.properties index 4da4bf0383..84f637129b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,8 @@ group=fork.test -version=1.21.8-R0.1-SNAPSHOT -mcVersion=1.21.8 -forkRef=c01a6baa00900afc11ec57d84bc6b82f58174790 +version=1.21.11-R0.1-SNAPSHOT +apiVersion=1.21.11 +mcVersion=1.21.11 +forkRef=b8d7e6bddaf8596c042a3761aa892f21a6a7d3e9 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55baa..f8e1ee3125 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 d4081da476..23449a2b54 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 23d15a9367..adff685a03 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index db3a6ac207..c4bdd3ab8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%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" %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/settings.gradle.kts b/settings.gradle.kts index abe84495c5..4ee48b27d3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,7 +7,7 @@ pluginManagement { } plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } rootProject.name = "forky"