diff --git a/PistonChat/build.gradle.kts b/PistonChat/build.gradle.kts index 5421ca3a..0cb484c2 100644 --- a/PistonChat/build.gradle.kts +++ b/PistonChat/build.gradle.kts @@ -7,18 +7,18 @@ description = "Advanced chat plugin for survival/anarchy servers." dependencies { compileOnly("com.google.code.findbugs:jsr305:3.0.2") - compileOnly("io.github.miniplaceholders:miniplaceholders-api:3.1.0") + compileOnly("io.github.miniplaceholders:miniplaceholders-api:3.2.0") compileOnly("jakarta.annotation:jakarta.annotation-api:3.0.0") compileOnly("org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT") implementation("net.pistonmaster:PistonUtils:1.4.0") - implementation("com.tcoded:FoliaLib:0.5.1") - implementation("com.google.code.gson:gson:2.13.2") + implementation("com.tcoded:FoliaLib:0.5.2") + implementation("com.google.code.gson:gson:2.14.0") implementation("net.kyori:adventure-platform-bukkit:4.4.1") implementation("net.kyori:adventure-text-minimessage:4.26.1") implementation("org.bstats:bstats-bukkit:3.2.1") - implementation("org.mariadb.jdbc:mariadb-java-client:3.5.7") - implementation("com.github.ben-manes.caffeine:caffeine:3.2.3") + implementation("org.mariadb.jdbc:mariadb-java-client:3.5.8") + implementation("com.github.ben-manes.caffeine:caffeine:3.2.4") implementation("de.exlll:configlib-paper:4.8.1") // Test dependencies for Bukkit API diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 9e546eed..ed0c4b9e 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -10,9 +10,9 @@ repositories { dependencies { implementation("com.diffplug.spotless:spotless-plugin-gradle:8.4.0") implementation("com.gradleup.shadow:shadow-gradle-plugin:9.4.1") - implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.4.8") + implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.5.4") implementation("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:5.1.0") - implementation("org.openrewrite:plugin:7.29.0") + implementation("org.openrewrite:plugin:7.32.1") } java { diff --git a/buildSrc/src/main/kotlin/pc.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/pc.java-conventions.gradle.kts index 9c168b38..f043fc54 100644 --- a/buildSrc/src/main/kotlin/pc.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/pc.java-conventions.gradle.kts @@ -20,17 +20,17 @@ rewrite { dependencies { compileOnlyApi("org.apiguardian:apiguardian-api:1.1.2") - errorprone("com.google.errorprone:error_prone_core:2.48.0") + errorprone("com.google.errorprone:error_prone_core:2.49.0") spotbugs("com.github.spotbugs:spotbugs:4.9.8") - rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.31.0") - rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.31.0") - rewrite("org.openrewrite.recipe:rewrite-rewrite:0.22.0") + rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.34.0") + rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.34.0") + rewrite("org.openrewrite.recipe:rewrite-rewrite:0.24.2") compileOnly("net.luckperms:api:5.5") compileOnly("com.github.spotbugs:spotbugs-annotations:4.9.8") - compileOnly("org.projectlombok:lombok:1.18.44") - annotationProcessor("org.projectlombok:lombok:1.18.44") + compileOnly("org.projectlombok:lombok:1.18.46") + annotationProcessor("org.projectlombok:lombok:1.18.46") testRuntimeOnly("org.junit.platform:junit-platform-launcher") testImplementation("org.junit.jupiter:junit-jupiter:6.0.3") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d997cfc6..b1b8ef56 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 c61a118f..b52fb7e7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 739907df..b9bb139f 100755 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/gradlew.bat b/gradlew.bat index e509b2dd..aa5f10b0 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -23,8 +23,8 @@ @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,7 +65,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line @@ -73,21 +73,10 @@ goto fail @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL%