Skip to content

Commit 1884c5d

Browse files
authored
Run JDK tests for Java 25 (#3874)
1 parent 418959f commit 1884c5d

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

modules/integration/src/test/scala/scala/cli/integration/RunJdkTestDefinitions.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ import scala.util.{Properties, Try}
88
trait RunJdkTestDefinitions { _: RunTestDefinitions =>
99
def javaIndex(javaVersion: Int): String =
1010
// TODO just passing the version number on arm64 should be enough, needs a fix in cs
11-
if (Properties.isMac && TestUtil.isM1 && (javaVersion < 11 || javaVersion == 16))
11+
if (
12+
(Properties.isMac && TestUtil.isM1 && (javaVersion < 11 || javaVersion == 16)) || javaVersion == 25
13+
)
1214
s"zulu:$javaVersion"
1315
else javaVersion.toString
1416

@@ -69,7 +71,7 @@ trait RunJdkTestDefinitions { _: RunTestDefinitions =>
6971
os.rel / "hello_world.sc" -> s"println(\"$expectedMessage\")"
7072
).fromRoot { root =>
7173
withLauncher(root) { launcher =>
72-
val res = os.proc(launcher, "run", ".", extraOptions, "--jvm", javaVersion)
74+
val res = os.proc(launcher, "run", ".", extraOptions, "--jvm", index)
7375
.call(cwd = root)
7476
expect(res.out.trim() == expectedMessage)
7577
}

project/deps/package.mill.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ object Java {
8383
def minimumBloopJava: Int = 17
8484
def minimumInternalJava: Int = 16
8585
def defaultJava: Int = minimumBloopJava
86-
def mainJavaVersions: Seq[Int] = Seq(8, 11, 17, 21, 23, 24)
86+
def mainJavaVersions: Seq[Int] = Seq(8, 11, 17, 21, 23, 24, 25)
8787
def allJavaVersions: Seq[Int] =
8888
(mainJavaVersions ++ Seq(minimumBloopJava, minimumInternalJava, defaultJava)).distinct
8989
}

0 commit comments

Comments
 (0)