Skip to content

Commit 38bc351

Browse files
committed
chore: require Java 17 (and test with 25)
Following cyclonedx-core-java doing the same https://github.com/CycloneDX/cyclonedx-core-java/releases/tag/cyclonedx-core-java-12.0.0 Also updates minimum sbt version to 1.10.11 for Java 25 support
1 parent 321b3b6 commit 38bc351

File tree

3 files changed

+18
-40
lines changed

3 files changed

+18
-40
lines changed

.github/workflows/ci.yml

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

51-
- name: Setup Java (temurin@8)
52-
if: matrix.java == 'temurin@8'
53-
uses: actions/setup-java@v5
54-
with:
55-
distribution: temurin
56-
java-version: 8
57-
cache: sbt
58-
59-
- name: Setup Java (temurin@11)
60-
if: matrix.java == 'temurin@11'
48+
- name: Setup Java (temurin@17)
49+
if: matrix.java == 'temurin@17'
6150
uses: actions/setup-java@v5
6251
with:
6352
distribution: temurin
64-
java-version: 11
53+
java-version: 17
6554
cache: sbt
6655

67-
- name: Setup Java (temurin@17)
68-
if: matrix.java == 'temurin@17'
56+
- name: Setup Java (temurin@25)
57+
if: matrix.java == 'temurin@25'
6958
uses: actions/setup-java@v5
7059
with:
7160
distribution: temurin
72-
java-version: 17
61+
java-version: 25
7362
cache: sbt
7463

7564
- name: Setup sbt
@@ -104,7 +93,7 @@ jobs:
10493
matrix:
10594
os: [ubuntu-latest]
10695
scala: [2.12.21]
107-
java: [temurin@8]
96+
java: [temurin@17]
10897
runs-on: ${{ matrix.os }}
10998
steps:
11099
- name: Ignore line ending differences in git
@@ -124,28 +113,20 @@ jobs:
124113
with:
125114
fetch-depth: 0
126115

127-
- name: Setup Java (temurin@8)
128-
if: matrix.java == 'temurin@8'
129-
uses: actions/setup-java@v5
130-
with:
131-
distribution: temurin
132-
java-version: 8
133-
cache: sbt
134-
135-
- name: Setup Java (temurin@11)
136-
if: matrix.java == 'temurin@11'
116+
- name: Setup Java (temurin@17)
117+
if: matrix.java == 'temurin@17'
137118
uses: actions/setup-java@v5
138119
with:
139120
distribution: temurin
140-
java-version: 11
121+
java-version: 17
141122
cache: sbt
142123

143-
- name: Setup Java (temurin@17)
144-
if: matrix.java == 'temurin@17'
124+
- name: Setup Java (temurin@25)
125+
if: matrix.java == 'temurin@25'
145126
uses: actions/setup-java@v5
146127
with:
147128
distribution: temurin
148-
java-version: 17
129+
java-version: 25
149130
cache: sbt
150131

151132
- name: Setup sbt

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Add the plugin dependency to the file `project/plugins.sbt` using `addSbtPlugin`
2525

2626
`addSbtPlugin("com.github.sbt" %% "sbt-sbom" % "0.5.0")`
2727

28-
Note that the minimum supported version of sbt is 1.6.0 (this is what the [scripted](https://www.scala-sbt.org/1.x/docs/Testing-sbt-plugins.html#scripted+test+framework) tests target)
28+
Note that the minimum officially supported version of sbt is 1.9.9 (this is what the [scripted](https://www.scala-sbt.org/1.x/docs/Testing-sbt-plugins.html#scripted+test+framework) tests target)
2929

3030
### BOM creation
3131

build.sbt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ lazy val root = (project in file("."))
2929
)
3030
},
3131
scriptedBufferLog := false,
32-
scriptedSbt := "1.6.0",
32+
scriptedSbt := "1.9.9",
3333
)
3434

3535
ThisBuild / pomIncludeRepository := { _ =>
@@ -65,13 +65,10 @@ ThisBuild / githubWorkflowPublish := Seq(
6565
ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest", "macos-latest", "windows-latest")
6666

6767
ThisBuild / githubWorkflowJavaVersions := Seq(
68-
JavaSpec.temurin("8"),
69-
JavaSpec.temurin("11"),
70-
JavaSpec.temurin("17")
68+
JavaSpec.temurin("17"),
69+
JavaSpec.temurin("25"),
7170
)
7271

73-
ThisBuild / githubWorkflowBuildMatrixExclusions += MatrixExclude(Map("java" -> "temurin@8", "os" -> "macos-latest"))
74-
7572
// scalafix specific settings
7673
inThisBuild(
7774
List(

0 commit comments

Comments
 (0)