Use JDK 17

siriusxm · Jul 22, 2024 · 3cabdff · 3cabdff
1 parent f89094d
commit 3cabdff
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [3]
-        java: [temurin@11]
+        java: [temurin@17]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
@@ -37,17 +37,17 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@11)
-        id: setup-java-temurin-11
-        if: matrix.java == 'temurin@11'
+      - name: Setup Java (temurin@17)
+        id: setup-java-temurin-17
+        if: matrix.java == 'temurin@17'
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
           cache: sbt
 
       - name: sbt update
-        if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
+        if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
         run: sbt +update
 
       - name: Check that workflows are up to date
@@ -78,25 +78,25 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java: [temurin@11]
+        java: [temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@11)
-        id: setup-java-temurin-11
-        if: matrix.java == 'temurin@11'
+      - name: Setup Java (temurin@17)
+        id: setup-java-temurin-17
+        if: matrix.java == 'temurin@17'
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
           cache: sbt
 
       - name: sbt update
-        if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
+        if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
         run: sbt +update
 
       - name: Download target directories (3)

diff --git a/build.sbt b/build.sbt
@@ -44,11 +44,12 @@ inThisBuild(
       tlGitHubDev("majk-p", "Michał Pawlik"),
       tlGitHubDev("zainab-ali", "Zainab Ali")
     ),
-    tlBaseVersion    := "0.0",
-    tlFatalWarnings  := sys.env.get("GITHUB_ACTIONS").contains("true"),
-    tlJdkRelease     := Some(17),
-    organizationName := "SiriusXM",
-    startYear        := Some(2024),
+    githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17")),
+    tlBaseVersion              := "0.0",
+    tlFatalWarnings            := sys.env.get("GITHUB_ACTIONS").contains("true"),
+    tlJdkRelease               := Some(17),
+    organizationName           := "SiriusXM",
+    startYear                  := Some(2024),
     licenses += ("Apache-2.0", new URL("https://www.apache.org/licenses/LICENSE-2.0.txt"))
   )
 )