internal: Support JDK21 (#510)

* Test with JDK21 * Use setup-java * fix test
xerial · Sep 24, 2023 · 681b2e1 · 681b2e1
1 parent 9f8c3cf
commit 681b2e1
Show file tree

Hide file tree

Showing 3 changed files with 217 additions and 194 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -36,9 +36,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: olafurpg/setup-scala@v14
+      - uses: actions/setup-java@v3
         with:
-          java-version: adopt@1.11
+          distribution: 'zulu'
+          java-version: '11'
       - uses: actions/cache@v3
         with:
           path: ~/.cache
@@ -51,9 +52,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: olafurpg/setup-scala@v14
+      - uses: actions/setup-java@v3
         with:
-          java-version: adopt@1.8
+          distribution: 'zulu'
+          java-version: '8'
       - uses: actions/cache@v3
         with:
           path: ~/.cache
@@ -66,13 +68,30 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: olafurpg/setup-scala@v14
+    - uses: actions/setup-java@v3
       with:
-        java-version: 17
+        distribution: 'zulu'
+        java-version: '17'
     - uses: actions/cache@v3
       with:
         path: ~/.cache
         key: ${{ runner.os }}-jdk17-${{ hashFiles('**/*.sbt') }}
         restore-keys: ${{ runner.os }}-jdk17-
     - name: Test
       run: ./sbt test
+  test_jdk21:
+    name: test jdk21
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '21'
+      - uses: actions/cache@v3
+        with:
+          path: ~/.cache
+          key: ${{ runner.os }}-jdk21-${{ hashFiles('**/*.sbt') }}
+          restore-keys: ${{ runner.os }}-jdk21-
+      - name: Test
+        run: ./sbt test
diff --git a/sbt b/sbt
@@ -34,11 +34,11 @@
 
 set -o pipefail
 
-declare -r sbt_release_version="1.8.2"
-declare -r sbt_unreleased_version="1.8.2"
+declare -r sbt_release_version="1.9.6"
+declare -r sbt_unreleased_version="1.9.6"
 
-declare -r latest_213="2.13.10"
-declare -r latest_212="2.12.17"
+declare -r latest_213="2.13.12"
+declare -r latest_212="2.12.18"
 declare -r latest_211="2.11.12"
 declare -r latest_210="2.10.7"
 declare -r latest_29="2.9.3"