Merge pull request #1966 from scalacenter/jdk22

test JDK22
scalacenter · Apr 10, 2024 · 6f1ee6c · 6f1ee6c
2 parents f9482c6 + dfe3dcb
commit 6f1ee6c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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"]
+        jvm: ["8", "11", "17", "21", "22"]
         include:
           - os: windows
             jvm: 21
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: coursier/setup-action@v1
         with:
-          jvm: temurin:${{ matrix.jvm }}
+          jvm: zulu:${{ matrix.jvm }}
       - if: ${{ matrix.os != 'windows' }}
         run: sbt test
       - if: ${{ matrix.os == 'windows' }}

diff --git a/project/ScalafixBuild.scala b/project/ScalafixBuild.scala
@@ -47,7 +47,11 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
               .map { patch => s"$binaryVersion.$patch" }
               .filterNot { v =>
                 System.getProperty("java.version").startsWith("21") &&
-                Seq("2.12.16", "2.12.17", "2.13.10").contains(v)
+                Seq("2.12.17").contains(v)
+              }
+              .filterNot { v =>
+                System.getProperty("java.version").startsWith("22") &&
+                Seq("2.12.17", "2.12.18", "2.13.11", "2.13.12").contains(v)
               }
           }