Skip to content

Commit 06f39d0

Browse files
authored
Add tests under Mill 0.12.x (#222)
- Update mill-integrationtest to 0.7.2 - Added Test running plugin with Mill 0.12.0 and 0.12.14 Fix: #212 Pull request: #222
1 parent 9043805 commit 06f39d0

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

README.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ Newer version of mill may or may not work. (Feel free to update this page via a
468468
[options="header"]
469469
|===
470470
| mill-integrationtest | mill
471-
| 0.7.2 | 0.9.x, 0.10.x, 0.11.x
471+
| 0.7.2 | 0.9.x, 0.10.x, 0.11.x, 0.12.x
472472
| 0.7.1 | 0.9.x, 0.10.x, 0.11.x
473473
| 0.7.0 | 0.9.x, 0.10.x, 0.11.0-M8
474474
| 0.6.1 | 0.9.3 - 0.9.x, 0.10.x
@@ -515,7 +515,7 @@ I also accept {project-home}/pulls[pull requests on GitHub].
515515
=== 0.7.2 - 2025-06-16
516516

517517
* Support test Mill 0.12 projects
518-
* Overhault and extended the test suite
518+
* Overhauled and extended the test suite
519519
* Update Scala to 2.13.16
520520

521521
=== 0.7.1 - 2023-06-07

build.sc

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// mill plugins
22
import $ivy.`com.lihaoyi::mill-contrib-scoverage:`
3-
import $ivy.`de.tototec::de.tobiasroeser.mill.integrationtest::0.7.1-35-94eeea`
3+
import $ivy.`de.tototec::de.tobiasroeser.mill.integrationtest::0.7.2`
44
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.1`
55

66
// imports
@@ -29,7 +29,7 @@ val millApiCrossVersions = Seq(
2929
new CrossConfig {
3030
override def millPlatform = "0.11"
3131
override def minMillVersion: String = "0.11.0" // scala-steward:off
32-
override def testWithMill: Seq[String] = Seq("0.11.13", minMillVersion)
32+
override def testWithMill: Seq[String] = Seq("0.12.14", "0.12.0", "0.11.13", minMillVersion)
3333
override def osLibVersion: String = "0.9.1"
3434
},
3535
new CrossConfig {
@@ -151,17 +151,11 @@ trait ItestCross extends MillIntegrationTestModule with Cross.Module[String] {
151151
TestInvocation.Targets(Seq("-d", "itest[0.11.0].test")),
152152
TestInvocation.Targets(Seq("-d", "itest[0.11.13].test"))
153153
) ++ {
154-
sys.props("java.version") match {
155-
case s"1.$_" | "8" | "9" | "10" =>
156-
println("Skipping Mill 0.12 itests due to too old JVM version")
157-
Seq()
158-
case v =>
159-
println(s"Including Mill 0.12 itests for JVM version $v")
160-
Seq(
161-
TestInvocation.Targets(Seq("-d", "itest[0.12.0].test")),
162-
TestInvocation.Targets(Seq("-d", "itest[0.12.14].test"))
163-
)
164-
}
154+
if (scala.util.Properties.isJavaAtLeast(11)) Seq(
155+
TestInvocation.Targets(Seq("-d", "itest[0.12.0].test")),
156+
TestInvocation.Targets(Seq("-d", "itest[0.12.14].test"))
157+
)
158+
else Seq()
165159
} ++
166160
// test default target
167161
Seq(TestInvocation.Targets(Seq("itest2")))
@@ -173,6 +167,8 @@ trait ItestCross extends MillIntegrationTestModule with Cross.Module[String] {
173167
case s"0.9.$_" => Seq("mill-0.9")
174168
case s"0.10.$_" => Seq("mill-0.10", "mill-0.9")
175169
case s"0.11.$_" => Seq("mill-0.11")
170+
case s"0.12.$_" if !scala.util.Properties.isJavaAtLeast(11) => Seq()
171+
case s"0.12.$_" => Seq("mill-0.11")
176172
}
177173

178174
super.testInvocations().flatMap { ti =>

0 commit comments

Comments
 (0)