Merge pull request #763 from samspills/sam/graalvm-version

.github/workflows/ci.yml

@@ -48,7 +48,7 @@ jobs:
           - temurin@11
           - temurin@17
           - graal_22.3.2@11
-          - graalvm@17
+          - graalvm@21
           - corretto@17
           - semeru@17
         project: [sbt-typelevelJVM]
@@ -63,9 +63,9 @@ jobs:
             os: macos-latest
           - java: graal_22.3.2@11
             os: windows-latest
-          - java: graalvm@17
+          - java: graalvm@21
             os: macos-latest
-          - java: graalvm@17
+          - java: graalvm@21
             os: windows-latest
           - java: corretto@17
             os: macos-latest
@@ -149,17 +149,17 @@ jobs:
         shell: bash
         run: sbt +update
 
-      - name: Setup Java (graalvm@17)
-        id: setup-java-graalvm-17
-        if: matrix.java == 'graalvm@17'
+      - name: Setup Java (graalvm@21)
+        id: setup-java-graalvm-21
+        if: matrix.java == 'graalvm@21'
         uses: actions/setup-java@v4
         with:
           distribution: graalvm
-          java-version: 17
+          java-version: 21
           cache: sbt
 
       - name: sbt update
-        if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
+        if: matrix.java == 'graalvm@21' && steps.setup-java-graalvm-21.outputs.cache-hit == 'false'
         shell: bash
         run: sbt +update
 
@@ -315,17 +315,17 @@ jobs:
         if: matrix.java == 'graal_22.3.2@11' && steps.setup-graalvm-22_3_2-11.outputs.cache-hit == 'false'
         run: sbt +update
 
-      - name: Setup Java (graalvm@17)
-        id: setup-java-graalvm-17
-        if: matrix.java == 'graalvm@17'
+      - name: Setup Java (graalvm@21)
+        id: setup-java-graalvm-21
+        if: matrix.java == 'graalvm@21'
         uses: actions/setup-java@v4
         with:
           distribution: graalvm
-          java-version: 17
+          java-version: 21
           cache: sbt
 
       - name: sbt update
-        if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
+        if: matrix.java == 'graalvm@21' && steps.setup-java-graalvm-21.outputs.cache-hit == 'false'
         run: sbt +update
 
       - name: Setup Java (corretto@17)
@@ -461,17 +461,17 @@ jobs:
         if: matrix.java == 'graal_22.3.2@11' && steps.setup-graalvm-22_3_2-11.outputs.cache-hit == 'false'
         run: sbt +update
 
-      - name: Setup Java (graalvm@17)
-        id: setup-java-graalvm-17
-        if: matrix.java == 'graalvm@17'
+      - name: Setup Java (graalvm@21)
+        id: setup-java-graalvm-21
+        if: matrix.java == 'graalvm@21'
         uses: actions/setup-java@v4
         with:
           distribution: graalvm
-          java-version: 17
+          java-version: 21
           cache: sbt
 
       - name: sbt update
-        if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
+        if: matrix.java == 'graalvm@21' && steps.setup-java-graalvm-21.outputs.cache-hit == 'false'
         run: sbt +update
 
       - name: Setup Java (corretto@17)
@@ -603,17 +603,17 @@ jobs:
         if: matrix.java == 'graal_22.3.2@11' && steps.setup-graalvm-22_3_2-11.outputs.cache-hit == 'false'
         run: sbt +update
 
-      - name: Setup Java (graalvm@17)
-        id: setup-java-graalvm-17
-        if: matrix.java == 'graalvm@17'
+      - name: Setup Java (graalvm@21)
+        id: setup-java-graalvm-21
+        if: matrix.java == 'graalvm@21'
         uses: actions/setup-java@v4
         with:
           distribution: graalvm
-          java-version: 17
+          java-version: 21
           cache: sbt
 
       - name: sbt update
-        if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
+        if: matrix.java == 'graalvm@21' && steps.setup-java-graalvm-21.outputs.cache-hit == 'false'
         run: sbt +update
 
       - name: Setup Java (corretto@17)

.mergify.yml

@@ -16,7 +16,7 @@ pull_request_rules:
   - status-success=Build and Test (ubuntu-latest, 2.12, temurin@11, sbt-typelevelJVM)
   - status-success=Build and Test (ubuntu-latest, 2.12, temurin@17, sbt-typelevelJVM)
   - status-success=Build and Test (ubuntu-latest, 2.12, graal_22.3.2@11, sbt-typelevelJVM)
-  - status-success=Build and Test (ubuntu-latest, 2.12, graalvm@17, sbt-typelevelJVM)
+  - status-success=Build and Test (ubuntu-latest, 2.12, graalvm@21, sbt-typelevelJVM)
   - status-success=Build and Test (ubuntu-latest, 2.12, corretto@17, sbt-typelevelJVM)
   - status-success=Build and Test (ubuntu-latest, 2.12, semeru@17, sbt-typelevelJVM)
   - status-success=Build and Test (macos-latest, 2.12, temurin@17, sbt-typelevelJVM)

build.sbt

@@ -19,7 +19,7 @@ ThisBuild / githubWorkflowJavaVersions ++= Seq(
   JavaSpec.temurin("11"),
   temurin17,
   JavaSpec(JavaSpec.Distribution.GraalVM("22.3.2"), "11"),
-  JavaSpec.graalvm("17"),
+  JavaSpec.graalvm("21"),
   JavaSpec.corretto("17"),
   JavaSpec.semeru("17")
 )