Skip to content

Commit d028895

Browse files
xuwei-kxuwei-k
committed
Update Java versions
1 parent abdc608 commit d028895

2 files changed

Lines changed: 43 additions & 39 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ jobs:
2929
matrix:
3030
os: [ubuntu-22.04]
3131
scala: [2.13, 3]
32-
java: [temurin@8, temurin@21]
32+
java: [temurin@11, temurin@25]
3333
project: [rootJS, rootJVM, rootNative]
3434
exclude:
3535
- project: rootJS
36-
java: temurin@21
36+
java: temurin@25
3737
- project: rootNative
38-
java: temurin@21
38+
java: temurin@25
3939
runs-on: ${{ matrix.os }}
4040
timeout-minutes: 60
4141
steps:
@@ -47,37 +47,37 @@ jobs:
4747
- name: Setup sbt
4848
uses: sbt/setup-sbt@v1
4949

50-
- name: Setup Java (temurin@8)
51-
id: setup-java-temurin-8
52-
if: matrix.java == 'temurin@8'
50+
- name: Setup Java (temurin@11)
51+
id: setup-java-temurin-11
52+
if: matrix.java == 'temurin@11'
5353
uses: actions/setup-java@v5
5454
with:
5555
distribution: temurin
56-
java-version: 8
56+
java-version: 11
5757
cache: sbt
5858

5959
- name: sbt update
60-
if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
60+
if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
6161
run: sbt +update
6262

63-
- name: Setup Java (temurin@21)
64-
id: setup-java-temurin-21
65-
if: matrix.java == 'temurin@21'
63+
- name: Setup Java (temurin@25)
64+
id: setup-java-temurin-25
65+
if: matrix.java == 'temurin@25'
6666
uses: actions/setup-java@v5
6767
with:
6868
distribution: temurin
69-
java-version: 21
69+
java-version: 25
7070
cache: sbt
7171

7272
- name: sbt update
73-
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
73+
if: matrix.java == 'temurin@25' && steps.setup-java-temurin-25.outputs.cache-hit == 'false'
7474
run: sbt +update
7575

7676
- name: Check that workflows are up to date
7777
run: sbt githubWorkflowCheck
7878

7979
- name: Check formatting
80-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
80+
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04'
8181
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' scalafmtCheckAll 'project /' scalafmtSbtCheck
8282

8383
- name: scalaJSLink
@@ -92,11 +92,11 @@ jobs:
9292
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
9393

9494
- name: Check binary compatibility
95-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
95+
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04'
9696
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
9797

9898
- name: Generate API documentation
99-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
99+
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04'
100100
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
101101

102102
- name: Run documentation
@@ -125,7 +125,7 @@ jobs:
125125
strategy:
126126
matrix:
127127
os: [ubuntu-22.04]
128-
java: [temurin@8]
128+
java: [temurin@11]
129129
runs-on: ${{ matrix.os }}
130130
steps:
131131
- name: Checkout current branch (full)
@@ -136,30 +136,30 @@ jobs:
136136
- name: Setup sbt
137137
uses: sbt/setup-sbt@v1
138138

139-
- name: Setup Java (temurin@8)
140-
id: setup-java-temurin-8
141-
if: matrix.java == 'temurin@8'
139+
- name: Setup Java (temurin@11)
140+
id: setup-java-temurin-11
141+
if: matrix.java == 'temurin@11'
142142
uses: actions/setup-java@v5
143143
with:
144144
distribution: temurin
145-
java-version: 8
145+
java-version: 11
146146
cache: sbt
147147

148148
- name: sbt update
149-
if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
149+
if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
150150
run: sbt +update
151151

152-
- name: Setup Java (temurin@21)
153-
id: setup-java-temurin-21
154-
if: matrix.java == 'temurin@21'
152+
- name: Setup Java (temurin@25)
153+
id: setup-java-temurin-25
154+
if: matrix.java == 'temurin@25'
155155
uses: actions/setup-java@v5
156156
with:
157157
distribution: temurin
158-
java-version: 21
158+
java-version: 25
159159
cache: sbt
160160

161161
- name: sbt update
162-
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
162+
if: matrix.java == 'temurin@25' && steps.setup-java-temurin-25.outputs.cache-hit == 'false'
163163
run: sbt +update
164164

165165
- name: Download target directories (2.13, rootJS)
@@ -257,7 +257,7 @@ jobs:
257257
strategy:
258258
matrix:
259259
os: [ubuntu-22.04]
260-
java: [temurin@8]
260+
java: [temurin@11]
261261
runs-on: ${{ matrix.os }}
262262
steps:
263263
- name: Checkout current branch (full)
@@ -268,30 +268,30 @@ jobs:
268268
- name: Setup sbt
269269
uses: sbt/setup-sbt@v1
270270

271-
- name: Setup Java (temurin@8)
272-
id: setup-java-temurin-8
273-
if: matrix.java == 'temurin@8'
271+
- name: Setup Java (temurin@11)
272+
id: setup-java-temurin-11
273+
if: matrix.java == 'temurin@11'
274274
uses: actions/setup-java@v5
275275
with:
276276
distribution: temurin
277-
java-version: 8
277+
java-version: 11
278278
cache: sbt
279279

280280
- name: sbt update
281-
if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
281+
if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
282282
run: sbt +update
283283

284-
- name: Setup Java (temurin@21)
285-
id: setup-java-temurin-21
286-
if: matrix.java == 'temurin@21'
284+
- name: Setup Java (temurin@25)
285+
id: setup-java-temurin-25
286+
if: matrix.java == 'temurin@25'
287287
uses: actions/setup-java@v5
288288
with:
289289
distribution: temurin
290-
java-version: 21
290+
java-version: 25
291291
cache: sbt
292292

293293
- name: sbt update
294-
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
294+
if: matrix.java == 'temurin@25' && steps.setup-java-temurin-25.outputs.cache-hit == 'false'
295295
run: sbt +update
296296

297297
- name: Submit Dependencies

‎build.sbt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ inThisBuild(
2727
name = Some("Run documentation"),
2828
cond = Some(s"matrix.scala == '2.13' && matrix.project == 'rootJVM'")
2929
),
30-
githubWorkflowJavaVersions += JavaSpec.temurin("21"),
30+
githubWorkflowJavaVersions := Seq(
31+
JavaSpec.temurin("11"),
32+
JavaSpec.temurin("25")
33+
),
3134
githubWorkflowPublishPostamble += WorkflowStep.Sbt(
3235
List("docs/docusaurusPublishGhpages"),
3336
name = Some("Publish website"),
@@ -40,6 +43,7 @@ lazy val kindProjector = "org.typelevel" % "kind-projector" % "0.13.4" cross Cro
4043

4144
lazy val buildSettings = Seq(
4245
scalacOptions ++= Seq(
46+
"-release:8",
4347
"-encoding",
4448
"UTF-8",
4549
"-feature",

0 commit comments

Comments
 (0)