Merge pull request #2292 from scalacenter/jdk25

test and document JDK25 LTS support

Author: bjaglin

.github/workflows/ci.yml

@@ -10,10 +10,10 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu"]
-        jvm: ["8", "11", "17", "21", "23"]
+        jvm: ["8", "11", "17", "21", "25"]
         include:
           - os: windows
-            jvm: 21
+            jvm: 25
     name: ${{ matrix.os }} / JDK${{ matrix.jvm }}
     runs-on: ${{ matrix.os }}-latest
     steps:

docs/users/installation.md

@@ -8,7 +8,7 @@ title: Installation
 Scalafix is tested to work with:
 
 * **macOS, Linux or Windows**
-* **Java LTS (8, 11, 17 or 21)**
+* **Java LTS (8, 11, 17, 21 or 25)**
 * **Scala @SCALA212@, @SCALA213@, @SCALA3LTS@ LTS or @SCALA3NEXT@**
 
 Note that other setups may work, but could result in unexpected behavior.

project/Dependencies.scala

@@ -5,6 +5,7 @@ import sbt._
 /* scalafmt: { maxColumn = 140 }*/
 
 object Dependencies {
+  // upon bump, remove JDK25 exclusion in cliScalaVersions & in ScalafixSuite
   val scala212 = sys.props.getOrElse("scala212.nightly", "2.12.20")
   val scala213 = sys.props.getOrElse("scala213.nightly", "2.13.17")
   val scala33 = "3.3.6"

project/ScalafixBuild.scala

@@ -34,16 +34,17 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
     // https://github.com/scalameta/scalameta/issues/2485
     lazy val coreScalaVersions = Seq(scala212, scala213)
     lazy val cliScalaVersions = {
+      val scala3Versions = Seq(scala33, scala35, scala36, scala37)
       val jdk = System.getProperty("java.specification.version").toDouble
-      val scala3Versions =
-        // Scala 3.5 will never support JDK 23
-        if (jdk >= 23) Seq(scala33, scala36, scala37)
-        else Seq(scala33, scala35, scala36, scala37)
-      (coreScalaVersions ++ scala3Versions :+ scala3Next).distinct
+      val unsupportedVersions =
+        if (jdk >= 25) Seq(scala212, scala35, scala36)
+        else Nil
+      (coreScalaVersions ++ scala3Versions :+ scala3Next)
+        .diff(unsupportedVersions)
     }
     lazy val cliScalaVersionsWithTargets: Seq[(String, TargetAxis)] =
       cliScalaVersions.map(sv => (sv, TargetAxis(sv))) ++
-        Seq(scala213, scala212).flatMap { sv =>
+        cliScalaVersions.intersect(Seq(scala213, scala212)).flatMap { sv =>
           def previousVersions(scalaVersion: String): Seq[String] = {
             val split = scalaVersion.split('.')
             val binaryVersion = split.take(2).mkString(".")

scalafix-tests/integration/src/test/scala/scalafix/tests/interfaces/ScalafixSuite.scala

@@ -73,12 +73,14 @@ class ScalafixSuite extends AnyFunSuite {
   }
 
   test("classload Scala 2.12 with full version") {
+    if (jdk >= 25) cancel("Scala 2.12 is not yet supported on JDK25+")
     val scalafixAPI =
       Scalafix.fetchAndClassloadInstance("2.12.20", repositories)
     assert(scalafixAPI.scalaVersion() == Versions.scala212)
   }
 
   test("classload Scala 2.12 with major.minor version") {
+    if (jdk >= 25) cancel("Scala 2.12 is not yet supported on JDK25+")
     val scalafixAPI = Scalafix.fetchAndClassloadInstance("2.12", repositories)
     assert(scalafixAPI.scalaVersion() == Versions.scala212)
   }