Merge pull request #101 from takapi327/enhancement/2023-12-support-jdk17

Enhancement/2023 12 support jdk17
takapi327 · Dec 24, 2023 · 71804e0 · 71804e0
2 parents 069ce73 + daee900
commit 71804e0
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [3.3.1]
-        java: [temurin@11]
+        java: [temurin@11, temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
@@ -40,6 +40,14 @@ jobs:
           java-version: 11
           cache: sbt
 
+      - name: Setup Java (temurin@17)
+        if: matrix.java == 'temurin@17'
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 17
+          cache: sbt
+
       - name: Start up MySQL on Docker
         run: docker compose up -d
 
@@ -85,6 +93,14 @@ jobs:
           java-version: 11
           cache: sbt
 
+      - name: Setup Java (temurin@17)
+        if: matrix.java == 'temurin@17'
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 17
+          cache: sbt
+
       - name: Download target directories (3.3.1)
         uses: actions/download-artifact@v3
         with:
@@ -109,7 +125,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [3.3.1]
-        java: [temurin@11]
+        java: [temurin@11, temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
@@ -125,6 +141,14 @@ jobs:
           java-version: 11
           cache: sbt
 
+      - name: Setup Java (temurin@17)
+        if: matrix.java == 'temurin@17'
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 17
+          cache: sbt
+
       - name: Scalafmt check
         run: sbt scalafmtCheck
 
@@ -134,7 +158,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [3.3.1]
-        java: [temurin@11]
+        java: [temurin@11, temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
@@ -150,6 +174,14 @@ jobs:
           java-version: 11
           cache: sbt
 
+      - name: Setup Java (temurin@17)
+        if: matrix.java == 'temurin@17'
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 17
+          cache: sbt
+
       - name: sbt publishLocal
         run: sbt +publishLocal
 

diff --git a/build.sbt b/build.sbt
@@ -11,7 +11,7 @@ import Dependencies.*
 import Workflows.*
 
 ThisBuild / crossScalaVersions := Seq(scala3)
-ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin(java11))
+ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin(java11), JavaSpec.temurin(java17))
 ThisBuild / githubWorkflowBuildPreamble += dockerRun
 ThisBuild / githubWorkflowAddedJobs ++= Seq(
   scalaFmt.value, sbtScripted.value

diff --git a/project/Versions.scala b/project/Versions.scala
@@ -11,4 +11,5 @@ object ScalaVersions {
 
 object JavaVersions {
   val java11 = "11"
+  val java17 = "17"
 }
diff --git a/project/Workflows.scala b/project/Workflows.scala
@@ -23,7 +23,7 @@ object Workflows {
         )
       ),
       scalas = List(scala3),
-      javas = List(JavaSpec.temurin(java11)),
+      javas = List(JavaSpec.temurin(java11), JavaSpec.temurin(java17)),
     )
   )
 
@@ -42,7 +42,7 @@ object Workflows {
         )
       ),
       scalas = List(scala3),
-      javas = List(JavaSpec.temurin(java11)),
+      javas = List(JavaSpec.temurin(java11), JavaSpec.temurin(java17)),
     )
   )