From 0d8f932dd17618fcb7f41f84e0d242aaf936b5d2 Mon Sep 17 00:00:00 2001
From: Ruben Taelman <rubensworks@gmail.com>
Date: Thu, 9 Jan 2025 16:22:40 +0100
Subject: [PATCH] Update to Graal 24.1.1

---
 .github/workflows/ci.yml | 27 +++++++++++++++++++++------
 build.gradle             | 10 ++++++----
 gradle.properties        |  1 +
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3437809c..7ce60d7c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,9 +1,24 @@
 name: "CI"
 on: [push, pull_request]
+
+env:
+  DEFAULT_JAVA_VERSION: 17
+
 jobs:
   build:
-    name: Build
+    name: Build for Java ${{ matrix.java }}
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java:
+          - 17
+          - 18
+          - 19
+          - 20
+          - 21
+          - 22
+          - 23
     steps:
       - name: 'Checkout'
         uses: actions/checkout@v2
@@ -21,7 +36,7 @@ jobs:
       - name: 'Setup Java'
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: ${{ matrix.java }}
           java-package: jdk
       - name: 'Mark tag as release'
         if: startsWith(github.ref, 'refs/tags/')
@@ -60,13 +75,13 @@ jobs:
           CURSEFORGE_KEY_SECRET: ${{ secrets.CURSEFORGE_KEY_SECRET }}
         run: ./gradlew curseforge
       - name: 'Deploy to Modrinth'
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/') && startsWith(matrix.java, env.DEFAULT_JAVA_VERSION)
         env:
           MODRINTH_KEY_SECRET: ${{ secrets.MODRINTH_KEY_SECRET }}
         run: ./gradlew modrinth
       - name: 'Create GitHub release'
         id: create_release
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/') && startsWith(matrix.java, env.DEFAULT_JAVA_VERSION)
         uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -74,14 +89,14 @@ jobs:
           tag_name: ${{ github.ref }}
           release_name: ${{ github.ref }}
       - name: 'Deploy to Maven'
-        if: startsWith(github.ref, 'refs/heads/master')
+        if: startsWith(github.ref, 'refs/heads/master') && startsWith(matrix.java, env.DEFAULT_JAVA_VERSION)
         env:
           MAVEN_URL: ${{ secrets.MAVEN_URL }}
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_KEY: ${{ secrets.MAVEN_KEY }}
         run: ./gradlew publish
       - name: 'Deploy JavaDoc to GitHub Pages'
-        if: startsWith(github.ref, 'refs/heads/master')
+        if: startsWith(github.ref, 'refs/heads/master') && startsWith(matrix.java, env.DEFAULT_JAVA_VERSION)
         uses: JamesIves/github-pages-deploy-action@3.6.2
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/build.gradle b/build.gradle
index b191cfd0..53c063c7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -115,10 +115,12 @@ dependencies {
         transitive = false
     }
 
-    modLib "org.graalvm.sdk:graal-sdk:22.3.2"
-    shadow "org.graalvm.sdk:graal-sdk:22.3.2"
-    modLib "org.graalvm.js:js:22.3.2"
-    shadow "org.graalvm.js:js:22.3.2"
+    // https://mvnrepository.com/artifact/org.graalvm.sdk/graal-sdk
+    modLib "org.graalvm.sdk:graal-sdk:${project.graal_version}"
+    shadow "org.graalvm.sdk:graal-sdk:${project.graal_version}"
+    // https://mvnrepository.com/artifact/org.graalvm.js/js
+    modLib "org.graalvm.js:js:${project.graal_version}"
+    shadow "org.graalvm.js:js:${project.graal_version}"
 
 
     // Project lombok
diff --git a/gradle.properties b/gradle.properties
index 32d50344..a6f980aa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,7 @@ integrateddynamics_version=1.19.2-1.21.3-721
 release_type=release
 fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
 
+graal_version=24.1.1
 commoncapabilities_version=1.19.2-2.9.0-88
 
 # Workaround for Spotless bug