From 3e65fb78769c8e4f7b737b021c6bbb52d1d7b7af Mon Sep 17 00:00:00 2001 From: Jiuyang Liu Date: Wed, 26 May 2021 01:29:25 +0800 Subject: make mill support 2.13. (#1934) --- build.sc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'build.sc') diff --git a/build.sc b/build.sc index dbfe2438..bd5a3944 100644 --- a/build.sc +++ b/build.sc @@ -5,7 +5,7 @@ import coursier.maven.MavenRepository import $ivy.`com.lihaoyi::mill-contrib-buildinfo:$MILL_VERSION` import mill.contrib.buildinfo.BuildInfo -object chisel3 extends mill.Cross[chisel3CrossModule]("2.12.13") +object chisel3 extends mill.Cross[chisel3CrossModule]("2.13.6", "2.12.13") // The following stanza is searched for and used when preparing releases. // Please retain it. @@ -62,14 +62,14 @@ trait CommonModule extends CrossSbtModule with PublishModule { super.scalacOptions() ++ Agg( "-deprecation", "-feature" - ) + ) ++ (if (majorVersion == 13) Agg("-Ymacro-annotations") else Agg.empty[String]) } private val macroParadise = ivy"org.scalamacros:::paradise:2.1.1" - override def compileIvyDeps = Agg(macroParadise) + override def compileIvyDeps = if(majorVersion == 13) super.compileIvyDeps else Agg(macroParadise) - override def scalacPluginIvyDeps = Agg(macroParadise) + override def scalacPluginIvyDeps = if(majorVersion == 13) super.compileIvyDeps else Agg(macroParadise) def pomSettings = PomSettings( description = artifactName(), @@ -179,8 +179,8 @@ class chisel3CrossModule(val crossScalaVersion: String) extends CommonModule wit override def firrtlModule = m.firrtlModule override def ivyDeps = Agg( - ivy"${scalaOrganization()}:scala-library:$crossScalaVersion" - ) + ivy"${scalaOrganization()}:scala-library:$crossScalaVersion", + ) ++ (if (majorVersion == 13) Agg(ivy"${scalaOrganization()}:scala-compiler:$crossScalaVersion") else Agg.empty[Dep]) def scalacOptions = T { Seq( -- cgit v1.2.3