Skip to content

Commit 777c83d

Browse files
committed
Remove JDK21
1 parent 5163128 commit 777c83d

File tree

2 files changed

+2
-41
lines changed

2 files changed

+2
-41
lines changed

.github/workflows/ci.yml

+1-40
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
matrix:
3030
os: [ubuntu-22.04]
3131
scala: [2.11.12, 2.12.14, 2.13.6]
32-
java: [temurin@8, temurin@11, temurin@17, temurin@21]
32+
java: [temurin@8, temurin@11, temurin@17]
3333
runs-on: ${{ matrix.os }}
3434
timeout-minutes: 60
3535
steps:
@@ -80,19 +80,6 @@ jobs:
8080
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
8181
run: sbt +update
8282

83-
- name: Setup Java (temurin@21)
84-
id: setup-java-temurin-21
85-
if: matrix.java == 'temurin@21'
86-
uses: actions/setup-java@v4
87-
with:
88-
distribution: temurin
89-
java-version: 21
90-
cache: sbt
91-
92-
- name: sbt update
93-
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
94-
run: sbt +update
95-
9683
- name: Check that workflows are up to date
9784
run: sbt githubWorkflowCheck
9885

@@ -175,19 +162,6 @@ jobs:
175162
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
176163
run: sbt +update
177164

178-
- name: Setup Java (temurin@21)
179-
id: setup-java-temurin-21
180-
if: matrix.java == 'temurin@21'
181-
uses: actions/setup-java@v4
182-
with:
183-
distribution: temurin
184-
java-version: 21
185-
cache: sbt
186-
187-
- name: sbt update
188-
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
189-
run: sbt +update
190-
191165
- name: Download target directories (2.11.12)
192166
uses: actions/download-artifact@v4
193167
with:
@@ -298,19 +272,6 @@ jobs:
298272
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
299273
run: sbt +update
300274

301-
- name: Setup Java (temurin@21)
302-
id: setup-java-temurin-21
303-
if: matrix.java == 'temurin@21'
304-
uses: actions/setup-java@v4
305-
with:
306-
distribution: temurin
307-
java-version: 21
308-
cache: sbt
309-
310-
- name: sbt update
311-
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
312-
run: sbt +update
313-
314275
- name: Submit Dependencies
315276
uses: scalacenter/sbt-dependency-submission@v2
316277
with:

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ crossScalaVersions := Seq("2.11.12", "2.12.14", "2.13.6")
2626
ThisBuild / organization := "com.comcast.sirius"
2727
ThisBuild / organizationName := "Comcast Cable Communications Management, LLC"
2828
ThisBuild / startYear := Some(2012)
29-
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8"), JavaSpec.temurin("11"), JavaSpec.temurin("17"), JavaSpec.temurin("21"))
29+
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8"), JavaSpec.temurin("11"), JavaSpec.temurin("17"))
3030
ThisBuild / githubWorkflowScalaVersions := crossScalaVersions.value
3131
ThisBuild / tlCiMimaBinaryIssueCheck := false
3232

0 commit comments

Comments
 (0)