Skip to content

Commit

Permalink
Add support for Scala 2.13.15 (#138)
Browse files Browse the repository at this point in the history
  • Loading branch information
lihaoyi authored Sep 22, 2024
2 parents 8384186 + 64cba99 commit 44e033b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.11.11
0.11.12
11 changes: 2 additions & 9 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -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.12.20").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"
Expand All @@ -17,7 +12,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 {
Expand All @@ -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")
Expand Down

0 comments on commit 44e033b

Please sign in to comment.