Skip to content

Commit 3df5b09

Browse files
committed
use JDK 17
1 parent 1d0396c commit 3df5b09

File tree

2 files changed

+24
-21
lines changed

2 files changed

+24
-21
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 21 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@11]
32+
java: [temurin@17]
3333
project: [diffsonJVM, diffsonJS, diffsonNative]
3434
runs-on: ${{ matrix.os }}
3535
timeout-minutes: 60
@@ -42,24 +42,24 @@ jobs:
4242
- name: Setup sbt
4343
uses: sbt/setup-sbt@v1
4444

45-
- name: Setup Java (temurin@11)
46-
id: setup-java-temurin-11
47-
if: matrix.java == 'temurin@11'
45+
- name: Setup Java (temurin@17)
46+
id: setup-java-temurin-17
47+
if: matrix.java == 'temurin@17'
4848
uses: actions/setup-java@v4
4949
with:
5050
distribution: temurin
51-
java-version: 11
51+
java-version: 17
5252
cache: sbt
5353

5454
- name: sbt update
55-
if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
55+
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
5656
run: sbt +update
5757

5858
- name: Check that workflows are up to date
5959
run: sbt githubWorkflowCheck
6060

6161
- name: Check headers and formatting
62-
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04'
62+
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04'
6363
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
6464

6565
- name: scalaJSLink
@@ -74,11 +74,11 @@ jobs:
7474
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
7575

7676
- name: Check binary compatibility
77-
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04'
77+
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04'
7878
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
7979

8080
- name: Generate API documentation
81-
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04'
81+
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04'
8282
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
8383

8484
- name: Make target directories
@@ -103,7 +103,7 @@ jobs:
103103
strategy:
104104
matrix:
105105
os: [ubuntu-22.04]
106-
java: [temurin@11]
106+
java: [temurin@17]
107107
runs-on: ${{ matrix.os }}
108108
steps:
109109
- name: Checkout current branch (full)
@@ -114,17 +114,17 @@ jobs:
114114
- name: Setup sbt
115115
uses: sbt/setup-sbt@v1
116116

117-
- name: Setup Java (temurin@11)
118-
id: setup-java-temurin-11
119-
if: matrix.java == 'temurin@11'
117+
- name: Setup Java (temurin@17)
118+
id: setup-java-temurin-17
119+
if: matrix.java == 'temurin@17'
120120
uses: actions/setup-java@v4
121121
with:
122122
distribution: temurin
123-
java-version: 11
123+
java-version: 17
124124
cache: sbt
125125

126126
- name: sbt update
127-
if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
127+
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
128128
run: sbt +update
129129

130130
- name: Download target directories (2.12, diffsonJVM)
@@ -247,7 +247,7 @@ jobs:
247247
strategy:
248248
matrix:
249249
os: [ubuntu-22.04]
250-
java: [temurin@11]
250+
java: [temurin@17]
251251
runs-on: ${{ matrix.os }}
252252
steps:
253253
- name: Checkout current branch (full)
@@ -258,17 +258,17 @@ jobs:
258258
- name: Setup sbt
259259
uses: sbt/setup-sbt@v1
260260

261-
- name: Setup Java (temurin@11)
262-
id: setup-java-temurin-11
263-
if: matrix.java == 'temurin@11'
261+
- name: Setup Java (temurin@17)
262+
id: setup-java-temurin-17
263+
if: matrix.java == 'temurin@17'
264264
uses: actions/setup-java@v4
265265
with:
266266
distribution: temurin
267-
java-version: 11
267+
java-version: 17
268268
cache: sbt
269269

270270
- name: sbt update
271-
if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
271+
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
272272
run: sbt +update
273273

274274
- name: Submit Dependencies

build.sbt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ ThisBuild / developers := List(
2424
tlGitHubDev("ybasket", "Yannick Heiber")
2525
)
2626

27+
// use JDK 17
28+
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"))
29+
2730
// Silence binary compatibility warnings for test-interface in Scala Native 0.5.x series
2831
// has to include _native suffix due to https://github.com/sbt/sbt/issues/7140
2932
ThisBuild / libraryDependencySchemes +=

0 commit comments

Comments
 (0)