From 170994ac9d472b5a78692105a021b482493941a2 Mon Sep 17 00:00:00 2001 From: David Biancolin Date: Wed, 8 Dec 2021 07:16:24 +0000 Subject: [PATCH] [sbt] Seperate settings assignments onto multiple lines --- build.sbt | 3 ++- scripts/tutorial-patches/build.sbt.patch | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 565836f3..afb82b5d 100644 --- a/build.sbt +++ b/build.sbt @@ -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, diff --git a/scripts/tutorial-patches/build.sbt.patch b/scripts/tutorial-patches/build.sbt.patch index f09f99d4..bc67c91b 100644 --- a/scripts/tutorial-patches/build.sbt.patch +++ b/scripts/tutorial-patches/build.sbt.patch @@ -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, @@ -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)