diff --git a/build.gradle.kts b/build.gradle.kts index a18e415..4013b3f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,8 @@ plugins { `java-library` - id("org.graalvm.buildtools.native") version "1.0.0" - id("com.gradleup.shadow") version "9.4.1" - id("io.freefair.lombok") version "9.2.0" + id("org.graalvm.buildtools.native") version "1.1.2" + id("com.gradleup.shadow") version "9.4.2" + id("io.freefair.lombok") version "9.5.0" `maven-publish` } @@ -26,9 +26,9 @@ repositories { mavenLocal() } -val mcplVersion = "1.21.4.49" +val mcplVersion = "26.1.2.10" dependencies { - api("com.github.rfresh2:JDA:6.4.31") { + api("com.github.rfresh2:JDA:6.4.32") { exclude(group = "club.minnced") exclude(group = "net.java.dev.jna") exclude(group = "com.google.crypto.tink") @@ -36,7 +36,7 @@ dependencies { api("com.github.rfresh2:MCProtocolLib:$mcplVersion") { exclude(group = "io.netty") } - api(platform("io.netty:netty-bom:4.2.12.Final")) + api(platform("io.netty:netty-bom:4.2.15.Final")) api("io.netty:netty-buffer") api("io.netty:netty-codec-haproxy") api("io.netty:netty-codec-dns") @@ -54,7 +54,7 @@ dependencies { api("io.netty:netty-resolver-dns-native-macos") { artifact { classifier = "osx-aarch_64" } } api("org.cloudburstmc.math:api:2.0") api("org.cloudburstmc.math:immutable:2.0") - api("org.redisson:redisson:4.3.1") { + api("org.redisson:redisson:4.5.0") { exclude(group = "io.netty") } api("com.github.rfresh2:SimpleEventBus:1.6") @@ -68,33 +68,33 @@ dependencies { api("com.github.rfresh2.fastutil.maps:reference-object-maps:$fastutilVersion") api("com.github.rfresh2.fastutil.maps:long-double-maps:$fastutilVersion") api("com.github.rfresh2.fastutil.queues:int-queues:$fastutilVersion") - api("com.viaversion:viaversion-common:5.9.0-20260417.203614-32") - api("com.viaversion:viabackwards-common:5.9.0-20260417.203715-15") - api("com.viaversion:viarewind-common:4.1.0-20260409.155713-7") - api("org.jline:jline:4.0.12") + api("com.viaversion:viaversion-common:5.9.1") + api("com.viaversion:viabackwards-common:5.9.1") + api("com.viaversion:viarewind-common:4.1.1") + api("org.jline:jline:4.1.3") api("ar.com.hjg:pngj:2.1.0") api("com.zaxxer:HikariCP:7.0.2") - api("org.postgresql:postgresql:42.7.10") - api("org.jdbi:jdbi3-postgres:3.52.1") - api("com.google.guava:guava:33.5.0-jre") - api("ch.qos.logback:logback-classic:1.5.32") - api("org.slf4j:slf4j-api:2.0.17") - api("org.slf4j:jul-to-slf4j:2.0.17") + api("org.postgresql:postgresql:42.7.11") + api("org.jdbi:jdbi3-postgres:3.53.0") + api("com.google.guava:guava:33.6.0-jre") + api("ch.qos.logback:logback-classic:1.5.34") + api("org.slf4j:slf4j-api:2.0.18") + api("org.slf4j:jul-to-slf4j:2.0.18") api("com.mojang:brigadier:1.3.10") api("net.kyori:adventure-text-logger-slf4j") api("dev.omega24:upnp4j:1.0") - api(platform("tools.jackson:jackson-bom:3.1.2")) + api(platform("tools.jackson:jackson-bom:3.2.0")) api("tools.jackson.core:jackson-databind") api("tools.jackson.dataformat:jackson-dataformat-smile") - testImplementation(platform("org.junit:junit-bom:6.0.3")) + testImplementation(platform("org.junit:junit-bom:6.1.0")) testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.testcontainers:testcontainers:2.0.4") - testImplementation("org.testcontainers:testcontainers-junit-jupiter:2.0.4") + testImplementation("org.testcontainers:testcontainers:2.0.5") + testImplementation("org.testcontainers:testcontainers-junit-jupiter:2.0.5") testRuntimeOnly("org.junit.platform:junit-platform-launcher") compileOnly("com.google.auto.service:auto-service-annotations:1.1.1") annotationProcessor("com.google.auto.service:auto-service:1.1.1") - compileOnly("org.graalvm.sdk:nativeimage:25.0.2") + compileOnly("org.graalvm.sdk:nativeimage:25.0.3") } lombok { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d997cfc..b1b8ef5 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 069df9e..df6a6ad 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\://mirrors.cloud.tencent.com/gradle/gradle-9.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 739907d..b9bb139 --- 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 c4bdd3a..aa5f10b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,93 +1,82 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -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 - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -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 - -:execute -@rem Setup the command line - - - -@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" %* - -: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 +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +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 + +"%COMSPEC%" /c exit 1 + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +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 + +"%COMSPEC%" /c exit 1 + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +@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 + +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL%