From bdaaa419ad9227bf34cf95fe1a298309c543d4b1 Mon Sep 17 00:00:00 2001
From: Brice Jaglin <bjaglin@gmail.com>
Date: Tue, 24 Sep 2024 00:20:53 +0200
Subject: [PATCH] test JDK23

---
 .github/workflows/ci.yml    | 2 +-
 build.sbt                   | 5 +++++
 project/ScalafixBuild.scala | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b464b7fba6..9763829159 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu"]
-        jvm: ["8", "11", "17", "21", "22"]
+        jvm: ["8", "11", "17", "21", "23"]
         include:
           - os: windows
             jvm: 21
diff --git a/build.sbt b/build.sbt
index 0a4c75cbbc..d3e13f6c72 100644
--- a/build.sbt
+++ b/build.sbt
@@ -186,6 +186,11 @@ lazy val cli = projectMatrix
       jgit,
       commonText
     ),
+    dependencyOverrides ++= {
+      // force usage of the latest scala2 library to get compatibility with latest JDK
+      if (isScala3.value) Seq("org.scala-lang" % "scala-library" % scala213)
+      else Seq()
+    },
     libraryDependencies ++= {
       if (isScala3.value) Seq()
       else
diff --git a/project/ScalafixBuild.scala b/project/ScalafixBuild.scala
index 3f66fc02ce..83614cd79b 100644
--- a/project/ScalafixBuild.scala
+++ b/project/ScalafixBuild.scala
@@ -48,8 +48,8 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
             previousPatchVersions
               .map { patch => s"$binaryVersion.$patch" }
               .filterNot { v =>
-                System.getProperty("java.version").startsWith("22") &&
-                Seq("2.12.18").contains(v)
+                System.getProperty("java.version").startsWith("23") &&
+                Seq("2.12.18", "2.12.19", "2.13.13", "2.13.14").contains(v)
               }
           }