11// mill plugins
22import $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 `
44import $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