Skip to content

Commit b603447

Browse files
committed
Unlock newer Java versions in CI eventually
1 parent bcd3de5 commit b603447

File tree

2 files changed

+57
-4
lines changed

2 files changed

+57
-4
lines changed

.github/workflows/ci.yml

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@ jobs:
2424
matrix:
2525
os: [ubuntu-latest, macos-latest, windows-latest]
2626
scala: [2.13.17, 2.12.20, 3.3.7]
27-
java: [temurin@8, temurin@11]
27+
java:
28+
- temurin@8
29+
- temurin@11
30+
- temurin@17
31+
- temurin@21
32+
- temurin@25
2833
exclude:
2934
- java: temurin@8
3035
os: macos-latest
@@ -64,6 +69,30 @@ jobs:
6469
java-version: 11
6570
cache: sbt
6671

72+
- name: Setup Java (temurin@17)
73+
if: matrix.java == 'temurin@17'
74+
uses: actions/setup-java@v5
75+
with:
76+
distribution: temurin
77+
java-version: 17
78+
cache: sbt
79+
80+
- name: Setup Java (temurin@21)
81+
if: matrix.java == 'temurin@21'
82+
uses: actions/setup-java@v5
83+
with:
84+
distribution: temurin
85+
java-version: 21
86+
cache: sbt
87+
88+
- name: Setup Java (temurin@25)
89+
if: matrix.java == 'temurin@25'
90+
uses: actions/setup-java@v5
91+
with:
92+
distribution: temurin
93+
java-version: 25
94+
cache: sbt
95+
6796
- name: Setup sbt
6897
uses: sbt/setup-sbt@v1
6998

@@ -133,6 +162,30 @@ jobs:
133162
java-version: 11
134163
cache: sbt
135164

165+
- name: Setup Java (temurin@17)
166+
if: matrix.java == 'temurin@17'
167+
uses: actions/setup-java@v5
168+
with:
169+
distribution: temurin
170+
java-version: 17
171+
cache: sbt
172+
173+
- name: Setup Java (temurin@21)
174+
if: matrix.java == 'temurin@21'
175+
uses: actions/setup-java@v5
176+
with:
177+
distribution: temurin
178+
java-version: 21
179+
cache: sbt
180+
181+
- name: Setup Java (temurin@25)
182+
if: matrix.java == 'temurin@25'
183+
uses: actions/setup-java@v5
184+
with:
185+
distribution: temurin
186+
java-version: 25
187+
cache: sbt
188+
136189
- name: Setup sbt
137190
uses: sbt/setup-sbt@v1
138191

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,9 @@ ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest", "macos-latest", "windows-
202202
ThisBuild / githubWorkflowJavaVersions := Seq(
203203
JavaSpec.temurin("8"),
204204
JavaSpec.temurin("11"),
205-
// JavaSpec.temurin("17"), // can't test currently because until we drop usage of sun.security.x509.*
206-
// JavaSpec.temurin("21"),
207-
// JavaSpec.temurin("25"),
205+
JavaSpec.temurin("17"),
206+
JavaSpec.temurin("21"),
207+
JavaSpec.temurin("25"),
208208
)
209209

210210
ThisBuild / githubWorkflowBuildMatrixExclusions += MatrixExclude(Map("java" -> "temurin@8", "os" -> "macos-latest"))

0 commit comments

Comments
 (0)