diff --git a/.mill-version b/.mill-version index 5111446..a8839f7 100644 --- a/.mill-version +++ b/.mill-version @@ -1 +1 @@ -0.10.12 \ No newline at end of file +0.11.2 \ No newline at end of file diff --git a/build.sc b/build.sc index 00a5080..6866768 100644 --- a/build.sc +++ b/build.sc @@ -1,11 +1,12 @@ -import mill._, scalalib._, publish._ import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0` + +import mill._, scalalib._, publish._ import de.tobiasroeser.mill.vcs.version.VcsVersion object Deps { def acyclicAgg(scalaVersion: String) = Agg(ivy"com.lihaoyi:::acyclic:0.3.8") - .filter(_ => scalaVersion != "2.13.11" /* exclude unreleased versions, if any */ ) + .filter(_ => scalaVersion != "2.13.12" /* exclude unreleased versions, if any */ ) def scalaCompiler(scalaVersion: String) = ivy"org.scala-lang:scala-compiler:${scalaVersion}" val utest = ivy"com.lihaoyi::utest:0.8.1" @@ -14,10 +15,10 @@ object Deps { val crosses = Seq("2.11.12") ++ 8.to(18).map("2.12." + _) ++ - 0.to(11).map("2.13." + _) + 0.to(12).map("2.13." + _) -object acyclic extends Cross[AcyclicModule](crosses: _*) -class AcyclicModule(val crossScalaVersion: String) extends CrossScalaModule with PublishModule { +object acyclic extends Cross[AcyclicModule](crosses) +trait AcyclicModule extends CrossScalaModule with PublishModule { override def crossFullScalaVersion = true override def artifactName = "acyclic" def publishVersion = VcsVersion.vcsState().format() @@ -38,7 +39,7 @@ class AcyclicModule(val crossScalaVersion: String) extends CrossScalaModule with override def scalacPluginIvyDeps = Deps.acyclicAgg(crossScalaVersion) - object test extends Tests with TestModule.Utest { + object test extends ScalaTests with TestModule.Utest { override def sources = T.sources(millSourcePath / "src", millSourcePath / "resources") override def ivyDeps = Agg( Deps.utest,