diff --git a/build.sbt b/build.sbt index e6290b05e4..182144e2ea 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,7 @@ lazy val firrtlSettings = Seq( javacOptions ++= Seq("-source", "1.8", "-target", "1.8"), libraryDependencies ++= Seq( "org.scala-lang" % "scala-reflect" % scalaVersion.value, - "org.scalatest" %% "scalatest" % "3.2.14" % "test", + "org.scalatest" %% "scalatest" % "3.2.18" % "test", "org.scalatestplus" %% "scalacheck-1-15" % "3.2.11.0" % "test", "com.github.scopt" %% "scopt" % "3.7.1", "net.jcazevedo" %% "moultingyaml" % "0.4.2", diff --git a/build.sc b/build.sc index 52cd6cfd8b..0622bc24d0 100644 --- a/build.sc +++ b/build.sc @@ -68,7 +68,7 @@ class firrtlCrossModule(val crossScalaVersion: String) object test extends Tests { override def ivyDeps = T { Agg( - ivy"org.scalatest::scalatest:3.2.14", + ivy"org.scalatest::scalatest:3.2.18", ivy"org.scalatestplus::scalacheck-1-15:3.2.11.0" ) } @@ -123,7 +123,7 @@ class firrtlCrossModule(val crossScalaVersion: String) // get version from antlr4/antlr version output val systemAntlr4Version = os.proc(f).call(check = false).out.text().trim match { case versionPattern(v) => v - case _ => "0.0.0" + case _ => "0.0.0" } val systemAntlr4Path = os.Path(os.proc("bash", "-c", s"command -v $f").call().out.text().trim) if (checkSystemAntlr4Version) @@ -134,12 +134,12 @@ class firrtlCrossModule(val crossScalaVersion: String) else None else - // Perform a cursory version check, avoid using antlr2 - // check if system antlr4 version is greater than 4.0.0 - if (versionCompare(systemAntlr4Version, "4.0.0") >= 0) - Some(systemAntlr4Path) - else - None + // Perform a cursory version check, avoid using antlr2 + // check if system antlr4 version is greater than 4.0.0 + if (versionCompare(systemAntlr4Version, "4.0.0") >= 0) + Some(systemAntlr4Path) + else + None } catch { case _: IOException => None @@ -221,7 +221,7 @@ class firrtlCrossModule(val crossScalaVersion: String) // get version from protoc version output val systemProtocVersion = os.proc("protoc", "--version").call(check = false).out.text().trim match { case versionPattern(v) => v - case _ => "0.0.0" + case _ => "0.0.0" } val systemProtocPath = os.Path(os.proc("bash", "-c", "command -v protoc").call().out.text().trim) if (checkSystemProtocVersion) @@ -232,12 +232,12 @@ class firrtlCrossModule(val crossScalaVersion: String) else None else - // Perform a cursory version check - // check if system protoc version is greater than 3.0.0 - if (versionCompare(systemProtocVersion, "3.0.0") >= 0) - Some(systemProtocPath) - else - None + // Perform a cursory version check + // check if system protoc version is greater than 3.0.0 + if (versionCompare(systemProtocVersion, "3.0.0") >= 0) + Some(systemProtocPath) + else + None } catch { case _: IOException => None