Skip to content

Commit bb8207d

Browse files
authored
Merge pull request #1445 from fthomas/topic/jvm-17
Compile with JDK 17 and --release 8
2 parents 422a890 + d14857a commit bb8207d

3 files changed

Lines changed: 19 additions & 17 deletions

File tree

.github/workflows/ci.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
matrix:
3030
os: [ubuntu-22.04]
3131
scala: [2.12, 2.13, 3]
32-
java: [temurin@8]
32+
java: [temurin@17]
3333
runs-on: ${{ matrix.os }}
3434
timeout-minutes: 60
3535
steps:
@@ -41,17 +41,17 @@ jobs:
4141
- name: Setup sbt
4242
uses: sbt/setup-sbt@v1
4343

44-
- name: Setup Java (temurin@8)
45-
id: setup-java-temurin-8
46-
if: matrix.java == 'temurin@8'
44+
- name: Setup Java (temurin@17)
45+
id: setup-java-temurin-17
46+
if: matrix.java == 'temurin@17'
4747
uses: actions/setup-java@v5
4848
with:
4949
distribution: temurin
50-
java-version: 8
50+
java-version: 17
5151
cache: sbt
5252

5353
- name: sbt update
54-
if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
54+
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
5555
run: sbt +update
5656

5757
- name: Check that workflows are up to date
@@ -92,7 +92,7 @@ jobs:
9292
strategy:
9393
matrix:
9494
os: [ubuntu-22.04]
95-
java: [temurin@8]
95+
java: [temurin@17]
9696
runs-on: ${{ matrix.os }}
9797
steps:
9898
- name: Checkout current branch (full)
@@ -103,17 +103,17 @@ jobs:
103103
- name: Setup sbt
104104
uses: sbt/setup-sbt@v1
105105

106-
- name: Setup Java (temurin@8)
107-
id: setup-java-temurin-8
108-
if: matrix.java == 'temurin@8'
106+
- name: Setup Java (temurin@17)
107+
id: setup-java-temurin-17
108+
if: matrix.java == 'temurin@17'
109109
uses: actions/setup-java@v5
110110
with:
111111
distribution: temurin
112-
java-version: 8
112+
java-version: 17
113113
cache: sbt
114114

115115
- name: sbt update
116-
if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
116+
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
117117
run: sbt +update
118118

119119
- name: Download target directories (2.12)

.mergify.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ pull_request_rules:
2121
- or:
2222
- author=scala-steward
2323
- author=scala-steward[bot]
24-
- status-success=Test (ubuntu-22.04, 2.12, temurin@8)
25-
- status-success=Test (ubuntu-22.04, 2.13, temurin@8)
26-
- status-success=Test (ubuntu-22.04, 3, temurin@8)
24+
- status-success=Test (ubuntu-22.04, 2.12, temurin@17)
25+
- status-success=Test (ubuntu-22.04, 2.13, temurin@17)
26+
- status-success=Test (ubuntu-22.04, 3, temurin@17)
2727
actions:
2828
merge:
2929
method: merge

build.sbt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ ThisBuild / githubWorkflowPublish := Seq(
9797
)
9898
)
9999
)
100-
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec(Temurin, "8"))
100+
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec(Temurin, "17"))
101101
ThisBuild / githubWorkflowBuild :=
102102
Seq(
103103
WorkflowStep.Sbt(
@@ -432,7 +432,9 @@ lazy val compileSettings = Def.settings(
432432
"UTF-8",
433433
"-feature",
434434
"-language:existentials,experimental.macros,higherKinds,implicitConversions",
435-
"-unchecked"
435+
"-unchecked",
436+
"-release",
437+
"8"
436438
),
437439
scalacOptions ++= {
438440
CrossVersion.partialVersion(scalaVersion.value) match {

0 commit comments

Comments
 (0)