diff --git a/build.sbt b/build.sbt index ff3ca96897a..2313f634fd9 100644 --- a/build.sbt +++ b/build.sbt @@ -5,12 +5,12 @@ import scala.sys.process._ enablePlugins(PackPlugin) -val chiselVersion = "3.5.1" +val chiselVersion = "3.5.2" lazy val commonSettings = Seq( organization := "edu.berkeley.cs", version := "1.2-SNAPSHOT", - scalaVersion := "2.12.10", + scalaVersion := "2.12.15", parallelExecution in Global := false, traceLevel := 15, scalacOptions ++= Seq("-deprecation","-unchecked","-Xsource:2.11"), diff --git a/project/plugins.sbt b/project/plugins.sbt index 6fb426e3ff2..3a4c489865b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -16,6 +16,6 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.1") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.5" ) -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.21") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0") diff --git a/src/main/scala/rocket/ScratchpadSlavePort.scala b/src/main/scala/rocket/ScratchpadSlavePort.scala index 753c95a59bf..63f37b3254e 100644 --- a/src/main/scala/rocket/ScratchpadSlavePort.scala +++ b/src/main/scala/rocket/ScratchpadSlavePort.scala @@ -11,7 +11,7 @@ import freechips.rocketchip.util._ /* This adapter converts between diplomatic TileLink and non-diplomatic HellaCacheIO */ class ScratchpadSlavePort(address: Seq[AddressSet], coreDataBytes: Int, usingAtomics: Boolean)(implicit p: Parameters) extends LazyModule { - def this(address: AddressSet, coreDataBytes: Int, usingAtomics: Boolean)(implicit p: Parameters) { + def this(address: AddressSet, coreDataBytes: Int, usingAtomics: Boolean)(implicit p: Parameters) = { this(Seq(address), coreDataBytes, usingAtomics) }