From 21833099d57c0b9ebff576011c73763b9f1b2468 Mon Sep 17 00:00:00 2001 From: panbingkun Date: Sat, 21 Sep 2024 07:30:21 +0800 Subject: [PATCH 1/2] Add support for Scala 2.13.15 --- build.sc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sc b/build.sc index 33f6ac9..b35ccfc 100644 --- a/build.sc +++ b/build.sc @@ -5,7 +5,7 @@ import de.tobiasroeser.mill.vcs.version.VcsVersion object Deps { def acyclicAgg(scalaVersion: String) = { - Agg.when(!Seq("2.12.20").contains(scalaVersion) /* exclude unreleased versions, if any */ )( + Agg.when(!Seq("2.13.15").contains(scalaVersion) /* exclude unreleased versions, if any */ )( ivy"com.lihaoyi:::acyclic:0.3.12" ) } @@ -17,7 +17,7 @@ object Deps { val crosses = Seq("2.11.12") ++ 8.to(20).map("2.12." + _) ++ - 0.to(14).map("2.13." + _) + 0.to(15).map("2.13." + _) object acyclic extends Cross[AcyclicModule](crosses) trait AcyclicModule extends CrossScalaModule with PublishModule { From 64cba99736d278f4609d222e342a9a6faab75c97 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 23 Sep 2024 06:50:57 +0800 Subject: [PATCH 2/2] remove circular dep --- .mill-version | 2 +- build.sc | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.mill-version b/.mill-version index 1a77547..bd0119f 100644 --- a/.mill-version +++ b/.mill-version @@ -1 +1 @@ -0.11.11 +0.11.12 diff --git a/build.sc b/build.sc index b35ccfc..f602b43 100644 --- a/build.sc +++ b/build.sc @@ -4,11 +4,6 @@ import mill._, scalalib._, publish._ import de.tobiasroeser.mill.vcs.version.VcsVersion object Deps { - def acyclicAgg(scalaVersion: String) = { - Agg.when(!Seq("2.13.15").contains(scalaVersion) /* exclude unreleased versions, if any */ )( - ivy"com.lihaoyi:::acyclic:0.3.12" - ) - } def scalaCompiler(scalaVersion: String) = ivy"org.scala-lang:scala-compiler:${scalaVersion}" val utest = ivy"com.lihaoyi::utest:0.8.2" @@ -36,10 +31,8 @@ trait AcyclicModule extends CrossScalaModule with PublishModule { ) ) override def compileIvyDeps = - Agg(Deps.scalaCompiler(crossScalaVersion)) ++ - Deps.acyclicAgg(crossScalaVersion) + Agg(Deps.scalaCompiler(crossScalaVersion)) - override def scalacPluginIvyDeps = Deps.acyclicAgg(crossScalaVersion) object test extends ScalaTests with TestModule.Utest { override def sources = T.sources(millSourcePath / "src", millSourcePath / "resources")