From 33cfe8101950721f5756207504162b566c438ba8 Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Tue, 5 May 2020 17:41:06 -0700
Subject: Update scalatest 3.1.1 (#1430)

* Update scalatest to 3.1.1

* Update scalatest to 3.1.1

* Update scalatest to 3.1.1

* Add missing org.scalatest.flatspec.AnyFlatSpec import.

Co-authored-by: Scala Steward <me@scala-steward.org>
Co-authored-by: Scala Steward <43047562+scala-steward@users.noreply.github.com>---
 build.sbt                                              | 2 +-
 build.sc                                               | 2 +-
 src/test/scala/chiselTests/ChiselSpec.scala            | 3 ++-
 src/test/scala/chiselTests/stage/ChiselStageSpec.scala | 5 +++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.sbt b/build.sbt
index 91d647e5..083c0500 100644
--- a/build.sbt
+++ b/build.sbt
@@ -105,7 +105,7 @@ lazy val chiselSettings = Seq (
 // An explicit dependency on junit seems to alleviate this.
   libraryDependencies ++= Seq(
     "junit" % "junit" % "4.13" % "test",
-    "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"
   ),
diff --git a/build.sc b/build.sc
index 52a6aeda..d1e27289 100644
--- a/build.sc
+++ b/build.sc
@@ -97,7 +97,7 @@ class chisel3CrossModule(crossVersionValue: String) extends CommonModule with Pu
     }
 
     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",
       ivy"com.github.scopt::scopt:3.7.1"
     ) ++ ivyCrossDeps
diff --git a/src/test/scala/chiselTests/ChiselSpec.scala b/src/test/scala/chiselTests/ChiselSpec.scala
index 31d6d322..801dbac2 100644
--- a/src/test/scala/chiselTests/ChiselSpec.scala
+++ b/src/test/scala/chiselTests/ChiselSpec.scala
@@ -4,6 +4,7 @@ package chiselTests
 
 import org.scalatest._
 import org.scalatest.prop._
+import org.scalatest.flatspec.AnyFlatSpec
 import org.scalacheck._
 import chisel3._
 import chisel3.testers._
@@ -94,7 +95,7 @@ trait ChiselRunners extends Assertions with BackendCompilationUtilities {
 }
 
 /** Spec base class for BDD-style testers. */
-abstract class ChiselFlatSpec extends FlatSpec with ChiselRunners with Matchers
+abstract class ChiselFlatSpec extends AnyFlatSpec with ChiselRunners with Matchers
 
 class ChiselTestUtilitiesSpec extends ChiselFlatSpec {
   import org.scalatest.exceptions.TestFailedException
diff --git a/src/test/scala/chiselTests/stage/ChiselStageSpec.scala b/src/test/scala/chiselTests/stage/ChiselStageSpec.scala
index b14d79a1..a7a405f1 100644
--- a/src/test/scala/chiselTests/stage/ChiselStageSpec.scala
+++ b/src/test/scala/chiselTests/stage/ChiselStageSpec.scala
@@ -5,7 +5,8 @@ package chiselTests.stage
 import chisel3._
 import chisel3.stage.ChiselStage
 
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 object ChiselStageSpec {
 
@@ -18,7 +19,7 @@ object ChiselStageSpec {
 
 }
 
-class ChiselStageSpec extends FlatSpec with Matchers {
+class ChiselStageSpec extends AnyFlatSpec with Matchers {
 
   import ChiselStageSpec._
 
-- 
cgit v1.2.3