@@ -6,15 +6,17 @@ import com.goyeau.mill.scalafix.StyleModule
66import mill._
77import mill.Task.dest
88import mill.scalalib._
9- import mill.scalalib.api.ZincWorkerUtil.scalaNativeBinaryVersion
109import mill.scalalib.publish.{Developer, License, PomSettings, VersionControl}
1110import org.typelevel.scalacoptions.ScalacOptions._
1211import org.typelevel.scalacoptions.{ScalaVersion, ScalacOptions}
1312
14- object `mill-git` extends Cross[MillGitCross]("0.12.0")
13+ object `mill-git` extends Cross[MillGitCross]("0.12.0", "0.13.0-M0" )
1514trait MillGitCross extends Cross.Module[String] with StyleModule with GitVersionedPublishModule {
1615 val millVersion = crossValue
17- override def scalaVersion = "2.13.15"
16+ override def scalaVersion = millBinaryVersion(millVersion) match {
17+ case "0.11" => "2.13.16"
18+ case "0.13" => "3.6.3"
19+ }
1820 override def scalacOptions = super.scalacOptions() ++ ScalacOptions.tokensForVersion(
1921 ScalaVersion.unsafeFromString(scalaVersion()),
2022 ScalacOptions.default + source3 ++ fatalWarningOptions
@@ -58,7 +60,8 @@ trait MillGitCross extends Cross.Module[String] with StyleModule with GitVersion
5860 )
5961}
6062
61- def millBinaryVersion(millVersion: String) = scalaNativeBinaryVersion(millVersion) match {
62- case "0.12" => "0.11" // 0.12.x is binary compatible with 0.11.x
63- case version => version
63+ def millBinaryVersion(millVersion: String) = millVersion match {
64+ case version if version.startsWith("0.12") => "0.11" // 0.12.x is binary compatible with 0.11.x
65+ case version if version.startsWith("0.13") => "0.13"
66+ case _ => throw new IllegalArgumentException(s"Unsupported Mill version: $millVersion")
6467}
0 commit comments