From 8bf6b420e3fcdeec15da2927b694db128c7a12db Mon Sep 17 00:00:00 2001
From: Roberto Perez Alcolea <rperezalcolea@netflix.com>
Date: Fri, 3 Apr 2026 17:20:55 -0700
Subject: [PATCH] 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
---
 .github/workflows/ci.yml                              |  4 ++--
 build.sbt                                             | 11 +++++++++++
 .../src/test/scala/tests/GradleBuildToolSuite.scala   |  2 +-
 .../unit/src/test/scala/tests/JavaVersionSuite.scala  |  1 +
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 218819a80..961a480a0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
         # NOTE(olafurpg) Windows is not enabled because it times out due to reasons I don't understand.
         # os: [windows-latest, ubuntu-latest]
         os: [ubuntu-latest]
-        java: [8, 11, 17, 21]
+        java: [8, 11, 17, 21, 25]
     steps:
       - uses: actions/checkout@v4
 
@@ -140,7 +140,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [8, 11, 17, 21]
+        java: [8, 11, 17, 21, 25]
     steps:
       - uses: actions/checkout@v4
 
diff --git a/build.sbt b/build.sbt
index 817592107..afaebe8cd 100644
--- a/build.sbt
+++ b/build.sbt
@@ -429,6 +429,17 @@ lazy val minimized21 = project
   .dependsOn(agent, javacPlugin)
   .disablePlugins(JavaFormatterPlugin)
 
+lazy val minimized25 = project
+  .in(file("tests/minimized/.j25"))
+  .settings(
+    javaOnlySettings,
+    minimizedSettings,
+    javaToolchainVersion := "25",
+    javacOptions ++= javacModuleOptions
+  )
+  .dependsOn(agent, javacPlugin)
+  .disablePlugins(JavaFormatterPlugin)
+
 lazy val minimizedScala = project
   .in(file("tests/minimized-scala"))
   .settings(
diff --git a/tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala b/tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala
index 1228efaa0..396aae5dc 100644
--- a/tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala
+++ b/tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala
@@ -9,7 +9,7 @@ class Gradle_5_BuildToolSuite extends GradleBuildToolSuite(Gradle5)
 
 abstract class GradleBuildToolSuite(gradle: Tool.Gradle)
     extends GradleBuildToolSuiteBase(gradle) {
-  val allJava = List(8, 11, 17, 21)
+  val allJava = List(8, 11, 17, 21, 25)
 
   checkGradleBuild(
     "annotation-path",
diff --git a/tests/unit/src/test/scala/tests/JavaVersionSuite.scala b/tests/unit/src/test/scala/tests/JavaVersionSuite.scala
index 013cadccc..29ed3cdc1 100644
--- a/tests/unit/src/test/scala/tests/JavaVersionSuite.scala
+++ b/tests/unit/src/test/scala/tests/JavaVersionSuite.scala
@@ -14,5 +14,6 @@ class JavaVersionSuite extends FunSuite {
 
   checkVersion("1.8.0_272", "8")
   checkVersion("11.0.9", "11")
+  checkVersion("25.0.1", "25")
 
 }