Skip to content

Commit c730f5c

Browse files
committed
Build and test with Java 21 or newer only
1 parent a5a0f88 commit c730f5c

File tree

2 files changed

+17
-25
lines changed

2 files changed

+17
-25
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ 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]
28-
exclude:
29-
- java: temurin@8
30-
os: macos-latest
27+
java: [temurin@21, temurin@25]
3128
runs-on: ${{ matrix.os }}
3229
steps:
3330
- name: Ignore line ending differences in git
@@ -48,20 +45,20 @@ jobs:
4845
with:
4946
fetch-depth: 0
5047

51-
- name: Setup Java (temurin@8)
52-
if: matrix.java == 'temurin@8'
48+
- name: Setup Java (temurin@21)
49+
if: matrix.java == 'temurin@21'
5350
uses: actions/setup-java@v5
5451
with:
5552
distribution: temurin
56-
java-version: 8
53+
java-version: 21
5754
cache: sbt
5855

59-
- name: Setup Java (temurin@11)
60-
if: matrix.java == 'temurin@11'
56+
- name: Setup Java (temurin@25)
57+
if: matrix.java == 'temurin@25'
6158
uses: actions/setup-java@v5
6259
with:
6360
distribution: temurin
64-
java-version: 11
61+
java-version: 25
6562
cache: sbt
6663

6764
- name: Setup sbt
@@ -97,7 +94,7 @@ jobs:
9794
matrix:
9895
os: [ubuntu-latest]
9996
scala: [2.12.20]
100-
java: [temurin@8]
97+
java: [temurin@21]
10198
runs-on: ${{ matrix.os }}
10299
steps:
103100
- name: Ignore line ending differences in git
@@ -117,20 +114,20 @@ jobs:
117114
with:
118115
fetch-depth: 0
119116

120-
- name: Setup Java (temurin@8)
121-
if: matrix.java == 'temurin@8'
117+
- name: Setup Java (temurin@21)
118+
if: matrix.java == 'temurin@21'
122119
uses: actions/setup-java@v5
123120
with:
124121
distribution: temurin
125-
java-version: 8
122+
java-version: 21
126123
cache: sbt
127124

128-
- name: Setup Java (temurin@11)
129-
if: matrix.java == 'temurin@11'
125+
- name: Setup Java (temurin@25)
126+
if: matrix.java == 'temurin@25'
130127
uses: actions/setup-java@v5
131128
with:
132129
distribution: temurin
133-
java-version: 11
130+
java-version: 25
134131
cache: sbt
135132

136133
- name: Setup sbt

build.sbt

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ lazy val sslConfigCore = project
1616
.settings(AutomaticModuleName.settings("ssl.config.core"))
1717
.settings(osgiSettings: _*)
1818
.settings(
19-
javacOptions ++= Seq("-source", "1.8", "-target", "1.8"),
19+
javacOptions ++= Seq("-target", "21"),
2020
name := "ssl-config-core",
2121
mimaReportSignatureProblems := true,
2222
mimaPreviousArtifacts := Set("com.typesafe" %% "ssl-config-core" % "0.7.0"),
@@ -97,11 +97,6 @@ ThisBuild / githubWorkflowPublish := Seq(
9797
ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest", "macos-latest", "windows-latest")
9898

9999
ThisBuild / githubWorkflowJavaVersions := Seq(
100-
JavaSpec.temurin("8"),
101-
JavaSpec.temurin("11"),
102-
// JavaSpec.temurin("17"), // can't test currently because until we drop usage of sun.security.x509.*
103-
// JavaSpec.temurin("21"),
104-
// JavaSpec.temurin("25"),
100+
JavaSpec.temurin("21"),
101+
JavaSpec.temurin("25"),
105102
)
106-
107-
ThisBuild / githubWorkflowBuildMatrixExclusions += MatrixExclude(Map("java" -> "temurin@8", "os" -> "macos-latest"))

0 commit comments

Comments
 (0)