github actions: use jdk21 for all builds (#1801)

`--release=8` for both javac and scalac ensure that we don't use jdk9+ apis...
ShiftLeftSecurity · Jan 10, 2025 · d4a6533 · d4a6533
1 parent 2007cdb
commit d4a6533
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -19,8 +19,9 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v4
       with:
-        distribution: 'adopt'
-        java-version: 19
+        distribution: temurin
+        java-version: 21
+        cache: sbt
     - uses: sbt/setup-sbt@v1
     - name: Compile and run tests
       run: sbt +test

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,8 +20,9 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v4
       with:
-        distribution: 'adopt'
-        java-version: 19
+        distribution: temurin
+        java-version: 21
+        cache: sbt
     - uses: sbt/setup-sbt@v1
     - name: Check formatting
       run: sbt scalafmtCheck Test/scalafmtCheck
@@ -53,11 +54,12 @@ jobs:
         run: echo $PGP_SECRET | base64 --decode | gpg --batch --import
         env:
             PGP_SECRET: ${{ secrets.PGP_SECRET }}
-      - name: Set up JDK 11
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-version: 11
+          distribution: temurin
+          java-version: 21
+          cache: sbt
       - uses: sbt/setup-sbt@v1
       - name: Release to Sonatype
         run: sbt ciReleaseTagNextVersion ciReleaseSonatype