Skip to content

Commit

Permalink
[sbt] Seperate settings assignments onto multiple lines
Browse files Browse the repository at this point in the history
  • Loading branch information
davidbiancolin committed Dec 8, 2021
1 parent df8161c commit 170994a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ lazy val rocketConfig = (project in rocketChipDir / "api-config-chipsalliance/bu

lazy val rocketchip = freshProject("rocketchip", rocketChipDir)
.dependsOn(hardfloat, rocketMacros, rocketConfig)
.settings(commonSettings, chiselSettings)
.settings(commonSettings)
.settings(chiselSettings)
.settings(
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
Expand Down
6 changes: 3 additions & 3 deletions scripts/tutorial-patches/build.sbt.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/build.sbt b/build.sbt
index a00d7361..fbdf2e53 100644
index 2187fe12..2319fc95 100644
--- a/build.sbt
+++ b/build.sbt
@@ -161,7 +161,7 @@ lazy val testchipip = (project in file("generators/testchipip"))
@@ -162,7 +162,7 @@ lazy val testchipip = (project in file("generators/testchipip"))

lazy val chipyard = (project in file("generators/chipyard"))
.dependsOn(testchipip, rocketchip, boom, hwacha, sifive_blocks, sifive_cache, iocell,
Expand All @@ -11,7 +11,7 @@ index a00d7361..fbdf2e53 100644
dsptools, `rocket-dsp-utils`,
gemmini, icenet, tracegen, cva6, nvdla, sodor, ibex)
.settings(libraryDependencies ++= rocketLibDeps.value)
@@ -202,10 +202,10 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
@@ -203,10 +203,10 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
.settings(libraryDependencies ++= rocketLibDeps.value)
.settings(commonSettings)

Expand Down

0 comments on commit 170994a

Please sign in to comment.