Skip to content

Commit

Permalink
Add JDK 21 to CI
Browse files Browse the repository at this point in the history
  • Loading branch information
mdedetrich committed Jan 26, 2024
1 parent a0284b6 commit eb208cd
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
18 changes: 17 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
scala: [2.12.18]
java: [temurin@8, temurin@11, temurin@17]
java: [temurin@8, temurin@11, temurin@17, temurin@21]
runs-on: ${{ matrix.os }}
steps:
- name: Ignore line ending differences in git
Expand Down Expand Up @@ -69,6 +69,14 @@ jobs:
java-version: 17
cache: sbt

- name: Setup Java (temurin@21)
if: matrix.java == 'temurin@21'
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 21
cache: sbt

- name: Check that workflows are up to date
shell: bash
run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
Expand Down Expand Up @@ -138,6 +146,14 @@ jobs:
java-version: 17
cache: sbt

- name: Setup Java (temurin@21)
if: matrix.java == 'temurin@21'
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 21
cache: sbt

- name: Download target directories (2.12.18)
uses: actions/download-artifact@v4
with:
Expand Down
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest", "macos-latest", "windows-
ThisBuild / githubWorkflowJavaVersions := Seq(
JavaSpec.temurin("8"),
JavaSpec.temurin("11"),
JavaSpec.temurin("17")
JavaSpec.temurin("17"),
JavaSpec.temurin("21")
)

name := "sbt-osgi"
Expand Down

0 comments on commit eb208cd

Please sign in to comment.