Update Gradle, build plugins and GitHub Actions (#5383)

.github/workflows/build-master.yml

@@ -5,6 +5,9 @@ on:
     branches:
     - 2.x
     - dev/*
+  release:
+    types:
+    - published
 
 jobs:
   build:
@@ -13,26 +16,18 @@ jobs:
 
     steps:
     - name: Checkout Git repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
-    - name: Restore Gradle cache
+    - name: Set up JDK 17
-      uses: actions/cache@v2
+      uses: actions/setup-java@v3
       with:
-        path: ~/.gradle/caches
+        distribution: 'temurin'
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+        java-version: 17
-        restore-keys: |
-          ${{ runner.os }}-gradle-
 
-    - name: Set up JDK 16
+    - name: Setup Gradle
-      uses: actions/setup-java@v2
+      uses: gradle/gradle-build-action@v2
-      with:
-        distribution: 'adopt'
-        java-version: 16
-
-    - name: Validate Gradle Wrapper
-      uses: gradle/wrapper-validation-action@v1
 
     - name: Build with Gradle
       run: |
@@ -40,7 +35,7 @@ jobs:
         ./gradlew build --stacktrace
 
     - name: Archive plugin jars on GitHub
-      uses: actions/upload-artifact@master
+      uses: actions/upload-artifact@v3
       with:
         name: EssentialsX plugin jars
         path: jars/
@@ -66,7 +61,7 @@ jobs:
         cp -r EssentialsXMPP/build/docs/javadoc/ javadocs/EssentialsXMPP/
 
     - name: Archive Javadocs
-      uses: actions/upload-artifact@master
+      uses: actions/upload-artifact@v3
       with:
         name: javadocs
         path: javadocs/
@@ -84,7 +79,7 @@ jobs:
         node-version: 16
 
     - name: Download Javadocs
-      uses: actions/download-artifact@master
+      uses: actions/download-artifact@v3
       with:
         name: javadocs
         path: javadocs/

.github/workflows/build-pr.yml

@@ -18,26 +18,18 @@ jobs:
 
     steps:
     - name: Checkout Git repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
-    - name: Restore Gradle cache
+    - name: Set up JDK 17
-      uses: actions/cache@v2
+      uses: actions/setup-java@v3
       with:
-        path: ~/.gradle/caches
+        distribution: 'temurin'
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+        java-version: 17
-        restore-keys: |
-          ${{ runner.os }}-gradle-
 
-    - name: Set up JDK 16
+    - name: Setup Gradle
-      uses: actions/setup-java@v2
+      uses: gradle/gradle-build-action@v2
-      with:
-        distribution: 'adopt'
-        java-version: 16
-
-    - name: Validate Gradle Wrapper
-      uses: gradle/wrapper-validation-action@v1
 
     - name: Build with Gradle
       run: |
@@ -45,7 +37,7 @@ jobs:
         ./gradlew build --stacktrace
 
     - name: Archive plugin jars on GitHub
-      uses: actions/upload-artifact@master
+      uses: actions/upload-artifact@v3
       with:
         name: EssentialsX plugin jars
         path: jars/

build-logic/build.gradle.kts

@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    implementation("net.kyori", "indra-common", "2.1.1")
+    implementation("net.kyori", "indra-common", "3.1.1")
-    implementation("gradle.plugin.com.github.johnrengelman", "shadow", "7.1.2")
+    implementation("com.github.johnrengelman", "shadow", "8.1.1")
-    implementation("xyz.jpenilla", "run-paper", "1.0.6")
+    implementation("xyz.jpenilla", "run-task", "2.1.0")
 }

build-logic/src/main/kotlin/essentials.parent-build-logic.gradle.kts

@@ -1,4 +1,4 @@
-import xyz.jpenilla.runpaper.task.RunServerTask
+import xyz.jpenilla.runpaper.task.RunServer
 
 plugins {
     id("base")
@@ -19,7 +19,7 @@ tasks {
         // Ex: './gradlew :runServer -PrunModules=chat,spawn'
         minecraftVersion(RUN_PAPER_MINECRAFT_VERSION)
     }
-    register<RunServerTask>("runAll") {
+    register<RunServer>("runAll") {
         group = "essentials"
         description = "Run a test server with all EssentialsX modules."
         minecraftVersion(RUN_PAPER_MINECRAFT_VERSION)
@@ -32,7 +32,7 @@ tasks {
 subprojects {
     afterEvaluate {
         val moduleExt = extensions.findByType<EssentialsModuleExtension>() ?: return@afterEvaluate
-        rootProject.tasks.named<RunServerTask>("runAll").configure {
+        rootProject.tasks.named<RunServer>("runAll").configure {
             pluginJars.from(moduleExt.archiveFile)
         }
         if (name == "EssentialsX") {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# This is normally unused
-
+# shellcheck disable=SC2034
-APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
-
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+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!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+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