From 59dc2337cbfabbbe1ff6e37e5750e49abe2097e1 Mon Sep 17 00:00:00 2001 From: Liphen Date: Tue, 7 May 2024 10:33:44 +0800 Subject: [PATCH] chore: Update Chisel dependencies to use version 6.1.0 --- chisel/build.sc | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/chisel/build.sc b/chisel/build.sc index 8857d9a..6b84b6f 100644 --- a/chisel/build.sc +++ b/chisel/build.sc @@ -7,8 +7,8 @@ import mill.scalalib.TestModule.ScalaTest import mill.bsp._ object playground extends ScalaModule with ScalafmtModule { m => - val useChisel5 = false - val useChisel6 = true + val useChisel5 = false + val useChisel6 = true override def scalaVersion = "2.13.10" override def scalacOptions = Seq( "-language:reflectiveCalls", @@ -17,24 +17,29 @@ object playground extends ScalaModule with ScalafmtModule { m => "-Xcheckinit" ) override def ivyDeps = Agg( - if (useChisel5) ivy"org.chipsalliance::chisel:5.0.0" else - if (useChisel6) ivy"org.chipsalliance::chisel:6.1.0" else - ivy"edu.berkeley.cs::chisel3:3.6.0", + if (useChisel5) ivy"org.chipsalliance::chisel:5.0.0" + else if (useChisel6) ivy"org.chipsalliance::chisel:6.1.0" + else + ivy"edu.berkeley.cs::chisel3:3.6.0" ) override def scalacPluginIvyDeps = Agg( - if (useChisel5) ivy"org.chipsalliance:::chisel-plugin:5.0.0" else - if (useChisel6) ivy"org.chipsalliance:::chisel-plugin:6.1.0" else - ivy"edu.berkeley.cs:::chisel3-plugin:3.6.0", + if (useChisel5) ivy"org.chipsalliance:::chisel-plugin:5.0.0" + else if (useChisel6) ivy"org.chipsalliance:::chisel-plugin:6.1.0" + else + ivy"edu.berkeley.cs:::chisel3-plugin:3.6.0" ) object test extends ScalaTests with ScalaTest { override def ivyDeps = m.ivyDeps() ++ Agg( ivy"com.lihaoyi::utest:0.8.1", - if (useChisel5) ivy"edu.berkeley.cs::chiseltest:5.0.0" else - ivy"edu.berkeley.cs::chiseltest:0.6.0", + if (useChisel5 || useChisel6) ivy"edu.berkeley.cs::chiseltest:5.0.0" + else + ivy"edu.berkeley.cs::chiseltest:0.6.0" ) } - def repositoriesTask = T.task { Seq( - coursier.MavenRepository("https://maven.aliyun.com/repository/central"), - coursier.MavenRepository("https://repo.scala-sbt.org/scalasbt/maven-releases"), - ) ++ super.repositoriesTask() } + def repositoriesTask = T.task { + Seq( + coursier.MavenRepository("https://maven.aliyun.com/repository/central"), + coursier.MavenRepository("https://repo.scala-sbt.org/scalasbt/maven-releases") + ) ++ super.repositoriesTask() + } }