Skip to content

Commit 64d76b9

Browse files
committed
test against JDK23
1 parent b81dc4a commit 64d76b9

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
os: ["ubuntu"]
13-
jvm: ["8", "11", "17", "21", "22"]
13+
jvm: ["8", "11", "17", "21", "23"]
1414
include:
1515
- os: windows
1616
jvm: 21

project/ScalafixBuild.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
3333

3434
// https://github.com/scalameta/scalameta/issues/2485
3535
lazy val coreScalaVersions = Seq(scala212, scala213)
36-
lazy val cliScalaVersions = Seq(
37-
scala212,
38-
scala213,
39-
scala33,
40-
scala35,
41-
scala36,
42-
scala3Next
43-
).distinct
36+
lazy val cliScalaVersions = {
37+
val jdk = System.getProperty("java.specification.version").toDouble
38+
val scala3Versions =
39+
// Scala 3.5 will never support JDK 23
40+
if (jdk >= 23) Seq(scala33, scala36)
41+
else Seq(scala33, scala35, scala36)
42+
(coreScalaVersions ++ scala3Versions :+ scala3Next).distinct
43+
}
4444
lazy val cliScalaVersionsWithTargets: Seq[(String, TargetAxis)] =
4545
cliScalaVersions.map(sv => (sv, TargetAxis(sv))) ++
4646
Seq(scala213, scala212).flatMap { sv =>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import scalafix.tests.BuildInfo
2525
*/
2626
class ScalafixSuite extends AnyFunSuite {
2727

28+
val jdk = System.getProperty("java.specification.version").toDouble
29+
2830
val scalaVersion: String = BuildInfo.scalaVersion
2931

3032
val repositories: java.util.List[Repository] = Seq[Repository](
@@ -117,11 +119,13 @@ class ScalafixSuite extends AnyFunSuite {
117119
}
118120

119121
test("classload Scala 3.5 with full version") {
122+
if (jdk >= 23) cancel("Scala 3.5 is not supported on JDK23+")
120123
val scalafixAPI = Scalafix.fetchAndClassloadInstance("3.5.2", repositories)
121124
assert(scalafixAPI.scalaVersion() == Versions.scala35)
122125
}
123126

124127
test("classload Scala 3.5 with major.minor version") {
128+
if (jdk >= 23) cancel("Scala 3.5 is not supported on JDK23+")
125129
val scalafixAPI = Scalafix.fetchAndClassloadInstance("3.5", repositories)
126130
assert(scalafixAPI.scalaVersion() == Versions.scala35)
127131
}

0 commit comments

Comments
 (0)