Merge pull request #58 from cb372/java-21

Use more recent versions of Java in CI
cb372 · Dec 11, 2024 · f400d6e · f400d6e
2 parents d6409cb + 44b2610
commit f400d6e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,8 +20,8 @@ jobs:
           - 3.3.3
           - 3.4.2
         java:
-          - 1.8
-          - 1.11
+          - 11
+          - 17
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -30,12 +30,11 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Java and Scala
-        uses: olafurpg/setup-scala@v13
+        uses: actions/setup-java@v4
         with:
-          java-version: adopt@${{ matrix.java }}
-
-      - name: Cache sbt
-        uses: coursier/cache-action@v6
+          distribution: 'adopt'
+          java-version: ${{ matrix.java }}
+          cache: 'sbt'
 
       - name: Test
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,10 +15,11 @@ jobs:
           fetch-depth: 0 # fetch all tags to make sbt-dynver work properly
 
       - name: Setup Java and Scala
-        uses: olafurpg/setup-scala@v13
-
-      - name: Cache sbt
-        uses: coursier/cache-action@v6
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'adopt'
+          java-version: 17
+          cache: 'sbt'
 
       - name: Publish
         run: sbt ci-release