Merge branch 'dev/patch' into fix/docs-release-push

.git-blame-ignore-revs

@@ -0,0 +1 @@
+# .git-blame-ignore-revs

.github/workflows/cleanup-docs.yml

@@ -15,7 +15,7 @@ jobs:
           echo "DOCS_OUTPUT_DIR=${GITHUB_WORKSPACE}/skript-docs/docs/nightly/${BRANCH_NAME}" >> $GITHUB_OUTPUT
           echo "DOCS_REPO_DIR=${GITHUB_WORKSPACE}/skript-docs" >> $GITHUB_OUTPUT
       - name: Checkout Skript
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
             ref: ${{ github.event.repository.default_branch }}
             submodules: recursive

.github/workflows/docs/setup-docs/action.yml

@@ -26,7 +26,7 @@ runs:
         ssh-key: ${{ inputs.docs_deploy_key }}
     - uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'adopt'
         cache: gradle
     - shell: bash

.github/workflows/java-17-builds.yml

@@ -1,4 +1,4 @@
-name: Java 17 CI (MC 1.17+)
+name: Java 17 CI (MC 1.17-1.20.4)
 
 on:
     push:
@@ -15,18 +15,20 @@ jobs:
             - uses: actions/checkout@v4
               with:
                   submodules: recursive
-            - name: Set up JDK 17
-              uses: actions/setup-java@v3
+            - name: validate gradle wrapper
+              uses: gradle/wrapper-validation-action@v2
+            - name: Set up JDK 21
+              uses: actions/setup-java@v4
               with:
-                  java-version: '17'
+                  java-version: '21'
                   distribution: 'adopt'
                   cache: gradle
             - name: Grant execute permission for gradlew
               run: chmod +x gradlew
             - name: Build Skript and run test scripts
               run: ./gradlew clean skriptTestJava17
             - name: Upload Nightly Build
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               if: success()
               with:
                   name: skript-nightly

.github/workflows/java-21-builds.yml

@@ -0,0 +1,35 @@
+name: Java 21 CI (MC 1.20.6+)
+
+on:
+    push:
+        branches:
+            - master
+            - 'dev/**'
+    pull_request:
+
+jobs:
+    build:
+        if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  submodules: recursive
+            - name: validate gradle wrapper
+              uses: gradle/wrapper-validation-action@v2
+            - name: Set up JDK 21
+              uses: actions/setup-java@v4
+              with:
+                  java-version: '21'
+                  distribution: 'adopt'
+                  cache: gradle
+            - name: Grant execute permission for gradlew
+              run: chmod +x gradlew
+            - name: Build Skript and run test scripts
+              run: ./gradlew clean skriptTestJava21
+            - name: Upload Nightly Build
+              uses: actions/upload-artifact@v4
+              if: success()
+              with:
+                  name: skript-nightly
+                  path: build/libs/*

.github/workflows/java-8-builds.yml

@@ -15,18 +15,20 @@ jobs:
             - uses: actions/checkout@v4
               with:
                   submodules: recursive
-            - name: Set up JDK 17
-              uses: actions/setup-java@v3
+            - name: validate gradle wrapper
+              uses: gradle/wrapper-validation-action@v2
+            - name: Set up JDK 21
+              uses: actions/setup-java@v4
               with:
-                  java-version: '17'
+                  java-version: '21'
                   distribution: 'adopt'
                   cache: gradle
             - name: Grant execute permission for gradlew
               run: chmod +x gradlew
             - name: Build Skript and run test scripts
               run: ./gradlew clean skriptTestJava8
             - name: Upload Nightly Build
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               if: success()
               with:
                   name: skript-nightly

.github/workflows/junit-17-builds.yml

@@ -1,4 +1,4 @@
-name: JUnit (MC 1.17+)
+name: JUnit (MC 1.17-1.20.4)
 
 on:
     push:
@@ -15,10 +15,12 @@ jobs:
             - uses: actions/checkout@v4
               with:
                   submodules: recursive
-            - name: Set up JDK 17
-              uses: actions/setup-java@v3
+            - name: validate gradle wrapper
+              uses: gradle/wrapper-validation-action@v2
+            - name: Set up JDK 21
+              uses: actions/setup-java@v4
               with:
-                  java-version: '17'
+                  java-version: '21'
                   distribution: 'adopt'
                   cache: gradle
             - name: Grant execute permission for gradlew

.github/workflows/junit-21-builds.disabled

@@ -0,0 +1,31 @@
+# Disabled as EasyMock 5.2.0 is required for Java 21 support
+# However, we are currently using 5.0.1 (see https://github.com/SkriptLang/Skript/pull/6204#discussion_r1405302009)
+name: JUnit (MC 1.20.6+)
+
+on:
+    push:
+        branches:
+            - master
+            - 'dev/**'
+    pull_request:
+
+jobs:
+    build:
+        if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  submodules: recursive
+            - name: validate gradle wrapper
+              uses: gradle/wrapper-validation-action@v2
+            - name: Set up JDK 21
+              uses: actions/setup-java@v4
+              with:
+                  java-version: '21'
+                  distribution: 'adopt'
+                  cache: gradle
+            - name: Grant execute permission for gradlew
+              run: chmod +x gradlew
+            - name: Build Skript and run JUnit
+              run: ./gradlew clean JUnitJava21

.github/workflows/junit-8-builds.yml

@@ -15,10 +15,12 @@ jobs:
             - uses: actions/checkout@v4
               with:
                   submodules: recursive
-            - name: Set up JDK 17
-              uses: actions/setup-java@v3
+            - name: validate gradle wrapper
+              uses: gradle/wrapper-validation-action@v2
+            - name: Set up JDK 21
+              uses: actions/setup-java@v4
               with:
-                  java-version: '17'
+                  java-version: '21'
                   distribution: 'adopt'
                   cache: gradle
             - name: Grant execute permission for gradlew

.github/workflows/release-docs.yml

@@ -70,6 +70,7 @@ jobs:
             with:
                 docs_output_dir: ${{ steps.configuration.outputs.DOCS_OUTPUT_DIR }}
                 docs_repo_dir: ${{ steps.configuration.outputs.DOCS_REPO_DIR }}
+                docs_output_dir: ${{ steps.configuration.outputs.DOCS_OUTPUT_DIR }}
                 skript_repo_dir: ${{ steps.configuration.outputs.SKRIPT_REPO_DIR }}
                 is_release: true
                 generate_javadocs: true

.github/workflows/repo.yml

@@ -11,10 +11,12 @@ jobs:
             - uses: actions/checkout@v4
               with:
                   submodules: recursive
-            - name: Set up JDK 17
-              uses: actions/setup-java@v3
+            - name: validate gradle wrapper
+              uses: gradle/wrapper-validation-action@v2
+            - name: Set up JDK 21
+              uses: actions/setup-java@v4
               with:
-                  java-version: '17'
+                  java-version: '21'
                   distribution: 'adopt'
                   cache: gradle
             - name: Publish Skript

README.md

@@ -77,13 +77,15 @@ Skript has some tests written in Skript. Running them requires a Minecraft
 server, but our build script will create one for you. Running the tests is easy:
 
 ```
-./gradlew (quickTest|skriptTest|skriptTestJava8|skriptTestJava17)
+./gradlew (quickTest|skriptTest|skriptTestJava8|skriptTestJava17|skriptTestJava21)
 ```
 
 <code>quickTest</code> runs the test suite on newest supported server version.
-<code>skriptTestJava17</code> (1.17+) runs the tests on the latest supported Java version.
-<code>skriptTestJava8</code> (1.13-1.16) runs the tests on the oldest supported Java version.
-<code>skriptTest</code> runs both skriptTestJava8 and skriptTestJava17
+<code>skriptTestJava21</code> (1.20.6+) runs the tests on Java 21 supported versions.
+<code>skriptTestJava17</code> (1.17-1.20.4) runs the tests on Java 17 supported versions.
+<code>skriptTestJava8</code> (1.13-1.16) runs the tests on Java 8 supported versions.
+<code>skriptTest</code> runs the tests on all versions.
+That is, it runs skriptTestJava8, skriptTestJava17, and skriptTestJava21.
 
 By running the tests, you agree to Mojang's End User License Agreement.