Skip to content

Commit 80d9a95

Browse files
authored
build: bump chisel 7 and keep compatible with 6.7.0 (#65)
1 parent 9e6f782 commit 80d9a95

5 files changed

Lines changed: 12 additions & 13 deletions

File tree

build.sc

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ import $file.`rocket-chip`.hardfloat.build
1212
val defaultScalaVersion = "2.13.15"
1313

1414
def defaultVersions = Map(
15-
"chisel" -> ivy"org.chipsalliance::chisel:6.7.0",
16-
"chisel-plugin" -> ivy"org.chipsalliance:::chisel-plugin:6.7.0",
17-
"chiseltest" -> ivy"edu.berkeley.cs::chiseltest:6.0.0"
15+
"chisel" -> ivy"org.chipsalliance::chisel:7.0.0",
16+
"chisel-plugin" -> ivy"org.chipsalliance:::chisel-plugin:7.0.0"
1817
)
1918

2019
trait HasChisel extends ScalaModule {
@@ -69,7 +68,11 @@ object utility extends SbtModule with HasChisel {
6968
override def millSourcePath = os.pwd / "utility"
7069

7170
override def moduleDeps = super.moduleDeps ++ Seq(rocketchip)
72-
}
71+
72+
override def ivyDeps = super.ivyDeps() ++ Agg(
73+
ivy"com.lihaoyi::sourcecode:0.4.4",
74+
)
75+
}
7376

7477
object huancun extends SbtModule with HasChisel {
7578
override def millSourcePath = os.pwd / "coupledL2" / "HuanCun"
@@ -103,11 +106,7 @@ object OpenLLC extends SbtModule with HasChisel with millbuild.common.OpenLLCMod
103106

104107
def openNCBModule: ScalaModule = openNCB
105108

106-
object test extends SbtModuleTests with TestModule.ScalaTest {
107-
override def ivyDeps = super.ivyDeps() ++ Agg(
108-
defaultVersions("chiseltest"),
109-
)
110-
}
109+
object test extends SbtModuleTests with TestModule.ScalaTest
111110

112111
override def scalacOptions = super.scalacOptions() ++ Agg("-deprecation", "-feature")
113112

0 commit comments

Comments
 (0)