Merge branch 'dev/patch' into item-tests

.github/workflows/archive-docs.yml

@@ -0,0 +1,45 @@
+name: Archive documentation
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+
+jobs:
+  archive-docs:
+      if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
+      needs: release-docs
+      runs-on: ubuntu-latest
+      steps:
+          - name: Configure workflow
+            id: configuration
+            run: |
+              echo "BRANCH_NAME=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+              echo "DOCS_OUTPUT_DIR=${GITHUB_WORKSPACE}/skript-docs/docs/archives/${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+              echo "DOCS_REPO_DIR=${GITHUB_WORKSPACE}/skript-docs" >> $GITHUB_OUTPUT
+              echo "SKRIPT_REPO_DIR=${GITHUB_WORKSPACE}/skript" >> $GITHUB_OUTPUT
+          - name: Checkout Skript
+            uses: actions/checkout@v4
+            with:
+                submodules: recursive
+                path: skript
+          - name: Setup documentation environment
+            uses: ./skript/.github/workflows/docs/setup-docs
+            with:
+                docs_deploy_key: ${{ secrets.DOCS_DEPLOY_KEY }}
+                docs_output_dir: ${{ steps.configuration.outputs.DOCS_OUTPUT_DIR }}
+          - name: Generate documentation
+            uses: ./skript/.github/workflows/docs/generate-docs
+            with:
+                docs_output_dir: ${{ steps.configuration.outputs.DOCS_OUTPUT_DIR }}
+                docs_repo_dir: ${{ steps.configuration.outputs.DOCS_REPO_DIR }}
+                skript_repo_dir: ${{ steps.configuration.outputs.SKRIPT_REPO_DIR }}
+                is_release: true
+                generate_javadocs: true
+          - name: Push archive documentation
+            uses: ./skript/.github/workflows/docs/push-docs
+            with:
+                docs_repo_dir: ${{ steps.configuration.outputs.DOCS_REPO_DIR }}
+                git_name: Archive Docs Bot
+                git_email: [email protected]
+                git_commit_message: "Update ${{ steps.configuration.outputs.BRANCH_NAME }} archive docs"

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

@@ -69,15 +69,15 @@ runs:
                   
         cd $SKRIPT_REPO_DIR
         if [[ "${IS_RELEASE}" == "true" ]]; then
-          ./gradlew genReleaseDocs releaseJavadoc
+          ./gradlew genReleaseDocs javadoc
         elif [[ "${GENERATE_JAVADOCS}" == "true" ]]; then
           ./gradlew genNightlyDocs javadoc
         else
           ./gradlew genNightlyDocs
         fi
 
         if [ -d "${DOCS_OUTPUT_DIR}" ]; then
-          if [[ "${GENERATE_JAVADOCS}" == "true" ]]; then
+          if [[ "${GENERATE_JAVADOCS}" == "true" ]] || [[ "${IS_RELEASE}" == "true" ]] ; then
               mkdir -p "${SKRIPT_DOCS_OUTPUT_DIR}/javadocs" && cp -a "./build/docs/javadoc/." "$_"
           fi
   

.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:
@@ -17,10 +17,10 @@ jobs:
                   submodules: recursive
             - name: validate gradle wrapper
               uses: gradle/wrapper-validation-action@v2
-            - name: Set up JDK 17
-              uses: actions/setup-java@v3
+            - 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/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

@@ -17,10 +17,10 @@ jobs:
                   submodules: recursive
             - name: validate gradle wrapper
               uses: gradle/wrapper-validation-action@v2
-            - name: Set up JDK 17
+            - 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-17-builds.yml

@@ -1,4 +1,4 @@
-name: JUnit (MC 1.17+)
+name: JUnit (MC 1.17-1.20.4)
 
 on:
     push:
@@ -17,10 +17,10 @@ jobs:
                   submodules: recursive
             - name: validate gradle wrapper
               uses: gradle/wrapper-validation-action@v2
-            - name: Set up JDK 17
+            - 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

@@ -17,10 +17,10 @@ jobs:
                   submodules: recursive
             - name: validate gradle wrapper
               uses: gradle/wrapper-validation-action@v2
-            - name: Set up JDK 17
+            - 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

@@ -3,6 +3,7 @@ name: Release documentation
 on:
   release:
     types: [published]
+  workflow_dispatch:
 
 jobs:
   release-docs:
@@ -33,6 +34,7 @@ jobs:
               docs_repo_dir: ${{ steps.configuration.outputs.DOCS_REPO_DIR }}
               skript_repo_dir: ${{ steps.configuration.outputs.SKRIPT_REPO_DIR }}
               is_release: true
+              generate_javadocs: true
               cleanup_pattern: "!(nightly|archives|templates)"
         - name: Push release documentation
           uses: ./skript/.github/workflows/docs/push-docs
@@ -41,40 +43,3 @@ jobs:
               git_name: Release Docs Bot
               git_email: [email protected]
               git_commit_message: "Update release docs to ${{ steps.configuration.outputs.BRANCH_NAME }}"
-
-  archive-docs:
-      if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
-      needs: release-docs
-      runs-on: ubuntu-latest
-      steps:
-          - name: Configure workflow
-            id: configuration
-            run: |
-              echo "BRANCH_NAME=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
-              echo "DOCS_OUTPUT_DIR=${GITHUB_WORKSPACE}/skript-docs/docs/archives/${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-              echo "DOCS_REPO_DIR=${GITHUB_WORKSPACE}/skript-docs" >> $GITHUB_OUTPUT
-              echo "SKRIPT_REPO_DIR=${GITHUB_WORKSPACE}/skript" >> $GITHUB_OUTPUT
-          - name: Checkout Skript
-            uses: actions/checkout@v4
-            with:
-                submodules: recursive
-                path: skript
-          - name: Setup documentation environment
-            uses: ./skript/.github/workflows/docs/setup-docs
-            with:
-                docs_deploy_key: ${{ secrets.DOCS_DEPLOY_KEY }}
-                docs_output_dir: ${{ steps.configuration.outputs.DOCS_OUTPUT_DIR }}
-          - name: Generate documentation
-            uses: ./skript/.github/workflows/docs/generate-docs
-            with:
-                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
-          - name: Push archive documentation
-            uses: ./skript/.github/workflows/docs/push-docs
-            with:
-                docs_repo_dir: ${{ steps.configuration.outputs.DOCS_REPO_DIR }}
-                git_name: Archive Docs Bot
-                git_email: [email protected]
-                git_commit_message: "Update ${{ steps.configuration.outputs.BRANCH_NAME }} archive docs"

.github/workflows/repo.yml

@@ -13,10 +13,10 @@ jobs:
                   submodules: recursive
             - name: validate gradle wrapper
               uses: gradle/wrapper-validation-action@v2
-            - name: Set up JDK 17
+            - 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.