diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 394f4a3..a3a2b59 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -16,14 +16,14 @@ jobs: fail-fast: false steps: - name: Checkout - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v4.3.0 - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@v4.5.0 + uses: actions/setup-java@v4.7.1 with: distribution: adopt java-version: '${{ matrix.java }}' - name: Cache Gradle - uses: actions/cache@v4.1.2 + uses: actions/cache@v4.3.0 with: path: ~/.gradle/caches key: >- @@ -35,7 +35,7 @@ jobs: - name: Build the Jar run: './gradlew clean shadowJar' - name: Upload a Build Artifact - uses: actions/upload-artifact@v4.4.3 + uses: actions/upload-artifact@v4.6.2 with: name: 'LobbyHeads' path: build/libs/LobbyHeads*.jar \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/lobbyheads-checkstyle.gradle.kts b/buildSrc/src/main/kotlin/lobbyheads-checkstyle.gradle.kts index 8843367..470a06e 100644 --- a/buildSrc/src/main/kotlin/lobbyheads-checkstyle.gradle.kts +++ b/buildSrc/src/main/kotlin/lobbyheads-checkstyle.gradle.kts @@ -3,7 +3,7 @@ plugins { } checkstyle { - toolVersion = "10.20.1" + toolVersion = "10.26.1" configFile = file("${rootDir}/checkstyle/checkstyle.xml") configProperties["checkstyle.suppressions.file"] = "${rootDir}/checkstyle/suppressions.xml" diff --git a/buildSrc/src/main/kotlin/lobbyheads-java-unit-test.gradle.kts b/buildSrc/src/main/kotlin/lobbyheads-java-unit-test.gradle.kts index 0c960a6..d08318e 100644 --- a/buildSrc/src/main/kotlin/lobbyheads-java-unit-test.gradle.kts +++ b/buildSrc/src/main/kotlin/lobbyheads-java-unit-test.gradle.kts @@ -3,10 +3,10 @@ plugins { } dependencies { - testImplementation("org.codehaus.groovy:groovy-all:3.0.23") - testImplementation(platform("org.junit:junit-bom:5.11.3")) + testImplementation("org.codehaus.groovy:groovy-all:3.0.25") + testImplementation(platform("org.junit:junit-bom:5.14.0")) testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.mockito:mockito-core:5.14.2") + testImplementation("org.mockito:mockito-core:5.20.0") } tasks.getByName("test") { 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 df97d72..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.10.2-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 f5feea6..23d15a9 100644 --- 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 9d21a21..db3a6ac 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/lobbyheads-core/build.gradle.kts b/lobbyheads-core/build.gradle.kts index 5136201..c1af2bf 100644 --- a/lobbyheads-core/build.gradle.kts +++ b/lobbyheads-core/build.gradle.kts @@ -5,13 +5,13 @@ plugins { `lobbyheads-checkstyle` id("net.minecrell.plugin-yml.bukkit") version "0.6.0" - id("com.gradleup.shadow") version "8.3.5" + id("com.gradleup.shadow") version "8.3.9" id("xyz.jpenilla.run-paper") version "2.3.1" } dependencies { // okaeri configs - val okaeriConfigsVersion = "5.0.5" + val okaeriConfigsVersion = "5.0.13" implementation("eu.okaeri:okaeri-configs-yaml-snakeyaml:${okaeriConfigsVersion}") implementation("eu.okaeri:okaeri-configs-serdes-commons:${okaeriConfigsVersion}") @@ -19,14 +19,14 @@ dependencies { api(project(":lobbyheads-api")) // a cool library, kyori - implementation("net.kyori:adventure-platform-bukkit:4.3.4") - implementation("net.kyori:adventure-text-minimessage:4.17.0") + implementation("net.kyori:adventure-platform-bukkit:4.4.1") + implementation("net.kyori:adventure-text-minimessage:4.25.0") // Rollczi's skullapi implementation("dev.rollczi:liteskullapi:1.3.0") // eternalcode commons - implementation("com.eternalcode:eternalcode-commons-adventure:1.1.4") + implementation("com.eternalcode:eternalcode-commons-adventure:1.3.1") // spigot-api compileOnly("org.spigotmc:spigot-api:1.20.2-R0.1-SNAPSHOT") @@ -36,7 +36,7 @@ dependencies { compileOnly("com.mojang:authlib:5.0.47") // HoloEasy based on top of the protocolib - implementation("com.github.unldenis:holoeasy:3.0.1") + implementation("com.github.unldenis:holoeasy:3.4.4") // PlaceholderAPI, if anyone wants to parse placeholders in the head's name compileOnly("me.clip:placeholderapi:2.11.6") @@ -48,10 +48,10 @@ dependencies { implementation("com.eternalcode:gitcheck:1.0.0") // tests setup - testImplementation("org.codehaus.groovy:groovy-all:3.0.23") - testImplementation(platform("org.junit:junit-bom:5.11.3")) + testImplementation("org.codehaus.groovy:groovy-all:3.0.25") + testImplementation(platform("org.junit:junit-bom:5.14.0")) testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.mockito:mockito-core:5.14.2") + testImplementation("org.mockito:mockito-core:5.20.0") } java {