From 4a9af128e387f9a066709f9b750619274dd1edbf Mon Sep 17 00:00:00 2001
From: Patryk Kowalcze <pkowalcze@users.noreply.github.com>
Date: Fri, 13 Oct 2023 10:57:33 +0200
Subject: [PATCH] use graalvm 21 (#416)

Co-authored-by: Patryk Kowalcze <patryk.kowalcze@ocado.com>
---
 .github/workflows/ci.yml | 42 ++++++++++++++++++++--------------------
 build.sbt                |  2 +-
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ec404dbe..cb9b58a4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.12]
-        java: [graalvm@20]
+        java: [graalvm@21]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
@@ -37,21 +37,21 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Download Java (graalvm@20)
-        id: download-java-graalvm-20
-        if: matrix.java == 'graalvm@20'
+      - name: Download Java (graalvm@21)
+        id: download-java-graalvm-21
+        if: matrix.java == 'graalvm@21'
         uses: typelevel/download-java@v2
         with:
           distribution: graalvm
-          java-version: 20
+          java-version: 21
 
-      - name: Setup Java (graalvm@20)
-        if: matrix.java == 'graalvm@20'
+      - name: Setup Java (graalvm@21)
+        if: matrix.java == 'graalvm@21'
         uses: actions/setup-java@v3
         with:
           distribution: jdkfile
-          java-version: 20
-          jdkFile: ${{ steps.download-java-graalvm-20.outputs.jdkFile }}
+          java-version: 21
+          jdkFile: ${{ steps.download-java-graalvm-21.outputs.jdkFile }}
 
       - name: Cache sbt
         uses: actions/cache@v3
@@ -69,18 +69,18 @@ jobs:
         run: sbt githubWorkflowCheck
 
       - name: Check headers and formatting
-        if: matrix.java == 'graalvm@20' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'graalvm@21' && matrix.os == 'ubuntu-latest'
         run: sbt '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
 
       - name: Test
         run: sbt '++ ${{ matrix.scala }}' test
 
       - name: Check binary compatibility
-        if: matrix.java == 'graalvm@20' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'graalvm@21' && matrix.os == 'ubuntu-latest'
         run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues
 
       - name: Generate API documentation
-        if: matrix.java == 'graalvm@20' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'graalvm@21' && matrix.os == 'ubuntu-latest'
         run: sbt '++ ${{ matrix.scala }}' doc
 
       - name: Integration tests
@@ -108,7 +108,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java: [graalvm@20]
+        java: [graalvm@21]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
@@ -116,21 +116,21 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Download Java (graalvm@20)
-        id: download-java-graalvm-20
-        if: matrix.java == 'graalvm@20'
+      - name: Download Java (graalvm@21)
+        id: download-java-graalvm-21
+        if: matrix.java == 'graalvm@21'
         uses: typelevel/download-java@v2
         with:
           distribution: graalvm
-          java-version: 20
+          java-version: 21
 
-      - name: Setup Java (graalvm@20)
-        if: matrix.java == 'graalvm@20'
+      - name: Setup Java (graalvm@21)
+        if: matrix.java == 'graalvm@21'
         uses: actions/setup-java@v3
         with:
           distribution: jdkfile
-          java-version: 20
-          jdkFile: ${{ steps.download-java-graalvm-20.outputs.jdkFile }}
+          java-version: 21
+          jdkFile: ${{ steps.download-java-graalvm-21.outputs.jdkFile }}
 
       - name: Cache sbt
         uses: actions/cache@v3
diff --git a/build.sbt b/build.sbt
index b39dc494..fc5708eb 100644
--- a/build.sbt
+++ b/build.sbt
@@ -11,7 +11,7 @@ ThisBuild / versionScheme := Some("early-semver")
 ThisBuild / homepage := Some(url("https://github.com/ocadotechnology/sttp-oauth2"))
 val Scala213 = "2.13.12"
 ThisBuild / scalaVersion := Scala213
-ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.graalvm("20"))
+ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.graalvm("21"))
 ThisBuild / githubWorkflowBuild ++= Seq(
   WorkflowStep.Sbt(
     commands = List("IntegrationTest/test"),