From 18e2bf72c2f87d95b7c15ea741ef6c379143b441 Mon Sep 17 00:00:00 2001
From: Matthew de Detrich <matthew.dedetrich@aiven.io>
Date: Fri, 11 Mar 2022 10:59:08 +0100
Subject: [PATCH] Add JDK8/JDK17 into CI matrix

---
 .github/workflows/ci.yml | 9 ++++++++-
 build.sbt                | 5 +++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 138805b..5d596a9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.12.15, 2.11.12, 2.13.8]
-        java: [temurin@11]
+        java: [temurin@11, temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
@@ -38,6 +38,13 @@ jobs:
           distribution: temurin
           java-version: 11
 
+      - name: Setup Java (temurin@17)
+        if: matrix.java == 'temurin@17'
+        uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 17
+
       - name: Cache sbt
         uses: actions/cache@v2
         with:
diff --git a/build.sbt b/build.sbt
index bffb9f9..8a6765a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -68,6 +68,11 @@ developers := List(
   Developer("johanandren", "Johan Andrén", "johan@markatta.com", url("https://markatta.com/johan/codemonkey"))
 )
 
+ThisBuild / githubWorkflowJavaVersions := List(
+  JavaSpec.temurin("11"),
+  JavaSpec.temurin("17")
+)
+
 // Disable publish for now
 ThisBuild / githubWorkflowPublishTargetBranches := Seq()