diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index f3eb425..28173a3 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -18,12 +18,12 @@ jobs: - name: Checkout uses: actions/checkout@v4.2.2 - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@v4.7.0 + uses: actions/setup-java@v4.7.1 with: distribution: adopt java-version: '${{ matrix.java }}' - name: Cache Gradle - uses: actions/cache@v4.2.1 + uses: actions/cache@v4.2.4 with: path: ~/.gradle/caches key: >- diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index dd01b95..48bcdfa 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -2,13 +2,13 @@ object Versions { const val ADVENTURE_PLATFORM_BUKKIT = "4.3.3" - const val ADVENTURE_API = "4.19.0" - const val CDN = "1.14.6" + const val ADVENTURE_API = "4.24.0" + const val CDN = "1.14.9" - const val MOCKITO_CORE = "5.15.2" - const val JUNIT_JUPITER = "5.11.4" - const val ASSERTJ_CORE = "3.27.3" - const val AWAITILITY = "4.2.2" + const val MOCKITO_CORE = "5.18.0" + const val JUNIT_JUPITER = "5.13.4" + const val ASSERTJ_CORE = "3.27.4" + const val AWAITILITY = "4.3.0" const val SPIGOT_API = "1.21.4-R0.1-SNAPSHOT" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9..1b33c55 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 e18bc25..d4081da 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.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f3b75f3..23d15a9 100644 --- a/gradlew +++ b/gradlew @@ -114,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. @@ -205,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. @@ -213,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 9b42019..5eed7ee 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 diff --git a/multification-okaeri/build.gradle.kts b/multification-okaeri/build.gradle.kts index bc68498..dd0e793 100644 --- a/multification-okaeri/build.gradle.kts +++ b/multification-okaeri/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { api(project(":multification-core")) // okaeri configs - val okaeriConfigsVersion = "5.0.6" + val okaeriConfigsVersion = "5.0.9" api("eu.okaeri:okaeri-configs-yaml-snakeyaml:${okaeriConfigsVersion}") api("eu.okaeri:okaeri-configs-serdes-commons:${okaeriConfigsVersion}")