Update scalatest to 3.1.1 (#1405)

* Update scalatest to 3.1.1 * Update scalatest to 3.1.1 * Update scalatest to 3.1.1 Co-authored-by: Jim Lawson <[email protected]> Co-authored-by: Schuyler Eldridge <[email protected]>
chipsalliance · May 6, 2020 · 724f8c5 · 724f8c5
1 parent e907346
commit 724f8c5
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -48,7 +48,7 @@ lazy val commonSettings = Seq(
   javacOptions ++= javacOptionsVersion(scalaVersion.value),
   libraryDependencies ++= Seq(
     "org.scala-lang" % "scala-reflect" % scalaVersion.value,
-    "org.scalatest" %% "scalatest" % "3.1.0" % "test",
+    "org.scalatest" %% "scalatest" % "3.1.1" % "test",
     "org.scalatestplus" %% "scalacheck-1-14" % "3.1.0.1" % "test",
     "com.github.scopt" %% "scopt" % "3.7.1",
     "net.jcazevedo" %% "moultingyaml" % "0.4.1",

diff --git a/build.sc b/build.sc
@@ -59,7 +59,7 @@ class firrtlCrossModule(crossVersion: String) extends ScalaModule with SbtModule
     }
 
     def ivyDeps = Agg(
-      ivy"org.scalatest::scalatest:3.1.0",
+      ivy"org.scalatest::scalatest:3.1.1",
       ivy"org.scalatestplus::scalacheck-1-14:3.1.0.1"
     ) ++ ivyCrossDeps
 

diff --git a/src/test/scala/firrtl/testutils/PassTests.scala b/src/test/scala/firrtl/testutils/PassTests.scala
@@ -10,6 +10,7 @@ import firrtl.stage.Forms
 import firrtl._
 import firrtl.annotations._
 import logger._
+import org.scalatest.flatspec.AnyFlatSpec
 
 // An example methodology for testing Firrtl Passes
 // Spec class should extend this class

diff --git a/src/test/scala/firrtlTests/CompilerTests.scala b/src/test/scala/firrtlTests/CompilerTests.scala
@@ -17,6 +17,8 @@ import firrtl.{
   Parser,
   VerilogCompiler
 }
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 /**
  * An example methodology for testing Firrtl compilers.

diff --git a/src/test/scala/firrtlTests/DriverSpec.scala b/src/test/scala/firrtlTests/DriverSpec.scala
@@ -16,6 +16,8 @@ import firrtl.util.BackendCompilationUtilities
 import firrtl.testutils.FirrtlFlatSpec
 
 import scala.util.Success
+import org.scalatest.freespec.AnyFreeSpec
+import org.scalatest.matchers.should.Matchers
 
 class ExceptingTransform extends Transform {
   def inputForm = HighForm

diff --git a/src/test/scala/firrtlTests/options/RegistrationSpec.scala b/src/test/scala/firrtlTests/options/RegistrationSpec.scala
@@ -10,6 +10,8 @@ import firrtl.options.{RegisteredTransform, RegisteredLibrary, ShellOption}
 import firrtl.passes.Pass
 import firrtl.ir.Circuit
 import firrtl.annotations.NoTargetAnnotation
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 case object HelloAnnotation extends NoTargetAnnotation
 

diff --git a/src/test/scala/firrtlTests/stage/FirrtlMainSpec.scala b/src/test/scala/firrtlTests/stage/FirrtlMainSpec.scala
@@ -12,6 +12,8 @@ import firrtl.FileUtils
 
 import firrtl.stage.FirrtlMain
 import firrtl.util.BackendCompilationUtilities
+import org.scalatest.featurespec.AnyFeatureSpec
+import org.scalatest.matchers.should.Matchers
 
 /** Testing for the top-level [[FirrtlStage]] via [[FirrtlMain]].
   *