Skip to content

Commit 8bf6b42

Browse files
committed
ci: add JDK 25 validation
Add JDK 25 to CI test matrices (sbt and Maven jobs), a minimized25 test project, and version parsing coverage to confirm the compiler plugin works correctly on JDK 25. Closes #857
1 parent 4486a05 commit 8bf6b42

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# NOTE(olafurpg) Windows is not enabled because it times out due to reasons I don't understand.
1515
# os: [windows-latest, ubuntu-latest]
1616
os: [ubuntu-latest]
17-
java: [8, 11, 17, 21]
17+
java: [8, 11, 17, 21, 25]
1818
steps:
1919
- uses: actions/checkout@v4
2020

@@ -140,7 +140,7 @@ jobs:
140140
strategy:
141141
fail-fast: false
142142
matrix:
143-
java: [8, 11, 17, 21]
143+
java: [8, 11, 17, 21, 25]
144144
steps:
145145
- uses: actions/checkout@v4
146146

build.sbt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,17 @@ lazy val minimized21 = project
429429
.dependsOn(agent, javacPlugin)
430430
.disablePlugins(JavaFormatterPlugin)
431431

432+
lazy val minimized25 = project
433+
.in(file("tests/minimized/.j25"))
434+
.settings(
435+
javaOnlySettings,
436+
minimizedSettings,
437+
javaToolchainVersion := "25",
438+
javacOptions ++= javacModuleOptions
439+
)
440+
.dependsOn(agent, javacPlugin)
441+
.disablePlugins(JavaFormatterPlugin)
442+
432443
lazy val minimizedScala = project
433444
.in(file("tests/minimized-scala"))
434445
.settings(

tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class Gradle_5_BuildToolSuite extends GradleBuildToolSuite(Gradle5)
99

1010
abstract class GradleBuildToolSuite(gradle: Tool.Gradle)
1111
extends GradleBuildToolSuiteBase(gradle) {
12-
val allJava = List(8, 11, 17, 21)
12+
val allJava = List(8, 11, 17, 21, 25)
1313

1414
checkGradleBuild(
1515
"annotation-path",

tests/unit/src/test/scala/tests/JavaVersionSuite.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ class JavaVersionSuite extends FunSuite {
1414

1515
checkVersion("1.8.0_272", "8")
1616
checkVersion("11.0.9", "11")
17+
checkVersion("25.0.1", "25")
1718

1819
}

0 commit comments

Comments
 (0)