Skip to content

Commit

Permalink
Drop java 8, support java 20
Browse files Browse the repository at this point in the history
  • Loading branch information
erikvanoosten committed Aug 13, 2023
1 parent bec2ce0 commit 8e6551f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,15 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.18]
java: [temurin@8, temurin@11, temurin@17]
scala: [2.13.10]
java: [temurin@11, temurin@17, temurin@20]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v3
with:
fetch-depth: 0

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

- name: Setup Java (temurin@11)
if: matrix.java == 'temurin@11'
uses: actions/setup-java@v3
Expand All @@ -55,6 +47,14 @@ jobs:
java-version: 17
cache: sbt

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

- name: Check that workflows are up to date
run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck

Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,11 @@ def scalacTargets(scalaVersion: String): Seq[String] = {
}

// Config for sbt-github-actions plugin
ThisBuild / crossScalaVersions := Seq("2.12.18")
ThisBuild / crossScalaVersions := Seq("2.13.10")
ThisBuild / githubWorkflowPublishTargetBranches := Seq()
ThisBuild / githubWorkflowJavaVersions := Seq(
JavaSpec.temurin("8"),
JavaSpec.temurin("11"),
JavaSpec.temurin("17")
JavaSpec.temurin("17"),
JavaSpec.temurin("20")
)

0 comments on commit 8e6551f

Please sign in to comment.