From e3e4a4bf77cae3d66bd5116e99ccde694d84dd39 Mon Sep 17 00:00:00 2001
From: Chris Kipp <ckipp@pm.me>
Date: Thu, 7 Oct 2021 11:26:00 +0200
Subject: [PATCH] Add Java 17 to the matrix and align javas

- Make sure to use temurin
- use actions/java in release like in ci
---
 .github/workflows/ci.yml      | 8 ++++----
 .github/workflows/release.yml | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 06bbe8e6..95fa8444 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ 'ubuntu-latest', 'windows-latest' ]
-        java: [ '8', '11' ]
+        java: [ '8', '11', '17' ]
         scala: [
             { version: '2.12.15' },
             { version: '2.12.14' },
@@ -36,7 +36,7 @@ jobs:
       - name: Set up JVM
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: ${{ matrix.java }}
 
       - name: run tests
@@ -54,8 +54,8 @@ jobs:
       - name: Set up JVM
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
-          java-version: '8'
+          distribution: 'temurin'
+          java-version: '17'
 
       - name: styleCheck
         run: sbt styleCheck
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0d4db699..f1509c13 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,7 +11,10 @@ jobs:
       - uses: actions/checkout@v2.3.4
         with:
           fetch-depth: 0
-      - uses: olafurpg/setup-scala@v13
+      - uses: actions/java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 17
       - run: sbt ci-release
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}