Support updated scalatest/scalacheck; bump sbt and Scala versions. (#605)

bump scoverage version

5 files changed, 9 insertions, 8 deletions

diff --git a/build.sbt b/build.sbt
index 0a739a87..2457d42c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -20,7 +20,7 @@ lazy val commonSettings = Seq (
   version := "3.1-SNAPSHOT",
   git.remoteRepo := "git@github.com:ucb-bar/chisel3.git",
   autoAPIMappings := true,
-  scalaVersion := "2.11.7",
+  scalaVersion := "2.11.11",
   scalacOptions := Seq("-deprecation", "-feature"),
   libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
   addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full),
@@ -81,9 +81,9 @@ lazy val chiselSettings = Seq (
   ),
 
   libraryDependencies ++= Seq(
-    "org.scalatest" %% "scalatest" % "2.2.5" % "test",
-    "org.scalacheck" %% "scalacheck" % "1.12.4" % "test",
-    "com.github.scopt" %% "scopt" % "3.4.0"
+    "org.scalatest" %% "scalatest" % "3.0.1" % "test",
+    "org.scalacheck" %% "scalacheck" % "1.13.4" % "test",
+    "com.github.scopt" %% "scopt" % "3.5.0"
   ),
 
   // Tests from other projects may still run concurrently.
diff --git a/project/build.properties b/project/build.properties
index 35c88bab..64317fda 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.12
+sbt.version=0.13.15
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 5ff66b4f..6703eda9 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -8,7 +8,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
 
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.3.5")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.4")
 
diff --git a/src/test/scala/chiselTests/ChiselSpec.scala b/src/test/scala/chiselTests/ChiselSpec.scala
index 143a1495..14672d68 100644
--- a/src/test/scala/chiselTests/ChiselSpec.scala
+++ b/src/test/scala/chiselTests/ChiselSpec.scala
@@ -68,7 +68,7 @@ class ChiselPropSpec extends PropSpec with ChiselRunners with PropertyChecks wit
 
   // Constrain the default number of instances generated for every use of forAll.
   implicit override val generatorDrivenConfig =
-    PropertyCheckConfig(minSuccessful = 8, minSize = 1, maxSize = 4)
+    PropertyCheckConfiguration(minSuccessful = 8, minSize = 1, sizeRange = 3)
 
   // Generator for small positive integers.
   val smallPosInts = Gen.choose(1, 4)
diff --git a/src/test/scala/chiselTests/Direction.scala b/src/test/scala/chiselTests/Direction.scala
index c3400013..83ef7088 100644
--- a/src/test/scala/chiselTests/Direction.scala
+++ b/src/test/scala/chiselTests/Direction.scala
@@ -4,6 +4,7 @@ package chiselTests
 
 import chisel3._
 import org.scalatest._
+import org.scalatest.matchers._
 import org.scalatest.prop._
 import chisel3.testers.BasicTester
 
@@ -22,7 +23,7 @@ class BadDirection extends DirectionHaver {
   io.in := 0.U
 }
 
-class DirectionSpec extends ChiselPropSpec with ShouldMatchers {
+class DirectionSpec extends ChiselPropSpec with Matchers {
 
   //TODO: In Chisel3 these are actually FIRRTL errors. Remove from tests?