Merge d03852d into 37d7734

blemale · Sep 18, 2019 · de457ea · de457ea
2 parents 37d7734 + d03852d
commit de457ea
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 9 deletions.
diff --git a/build.sbt b/build.sbt
@@ -17,8 +17,8 @@ libraryDependencies ++=
       "com.github.ben-manes.caffeine" % "caffeine" % CaffeineVersion.value,
       "org.scala-lang.modules" %% "scala-java8-compat" % "0.9.0",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "provided",
-      "org.scalactic" %% "scalactic" % "3.1.0-SNAP13" % "test",
-      "org.scalatest" %% "scalatest" % "3.1.0-SNAP13" % "test"
+      "org.scalactic" %% "scalactic" % "3.2.0-M1" % "test",
+      "org.scalatest" %% "scalatest" % "3.2.0-M1" % "test"
   )
 
 scalacOptions ++= Seq("-target:jvm-1.8")

diff --git a/src/test/scala/com/github/blemale/scaffeine/AsyncCacheSpec.scala b/src/test/scala/com/github/blemale/scaffeine/AsyncCacheSpec.scala
@@ -1,7 +1,8 @@
 package com.github.blemale.scaffeine
 
+import org.scalatest.OptionValues
 import org.scalatest.concurrent.ScalaFutures
-import org.scalatest.{ Matchers, OptionValues }
+import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
 import scala.concurrent.Future

diff --git a/src/test/scala/com/github/blemale/scaffeine/AsyncLoadingCacheSpec.scala b/src/test/scala/com/github/blemale/scaffeine/AsyncLoadingCacheSpec.scala
@@ -1,7 +1,8 @@
 package com.github.blemale.scaffeine
 
+import org.scalatest.OptionValues
 import org.scalatest.concurrent.ScalaFutures
-import org.scalatest.{ Matchers, OptionValues }
+import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
 import scala.concurrent.Future

diff --git a/src/test/scala/com/github/blemale/scaffeine/CacheSpec.scala b/src/test/scala/com/github/blemale/scaffeine/CacheSpec.scala
@@ -1,6 +1,7 @@
 package com.github.blemale.scaffeine
 
 import org.scalatest._
+import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
 class CacheSpec

diff --git a/src/test/scala/com/github/blemale/scaffeine/LoadingCacheSpec.scala b/src/test/scala/com/github/blemale/scaffeine/LoadingCacheSpec.scala
@@ -1,6 +1,7 @@
 package com.github.blemale.scaffeine
 
 import org.scalatest._
+import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
 class LoadingCacheSpec

diff --git a/src/test/scala/com/github/blemale/scaffeine/RemovalListenerSpec.scala b/src/test/scala/com/github/blemale/scaffeine/RemovalListenerSpec.scala
@@ -3,8 +3,8 @@ package com.github.blemale.scaffeine
 import java.util.concurrent.atomic.AtomicInteger
 
 import com.github.benmanes.caffeine.cache.RemovalCause
+import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
-import org.scalatest._
 
 class RemovalListenerSpec
   extends AnyWordSpec

diff --git a/src/test/scala/com/github/blemale/scaffeine/ScaffeineSpec.scala b/src/test/scala/com/github/blemale/scaffeine/ScaffeineSpec.scala
@@ -5,7 +5,8 @@ import java.util.concurrent.Executor
 import com.github.benmanes.caffeine
 import com.github.benmanes.caffeine.cache.Scheduler
 import com.github.benmanes.caffeine.cache.stats.StatsCounter
-import org.scalatest.{ Matchers, PrivateMethodTester }
+import org.scalatest.PrivateMethodTester
+import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
 import scala.concurrent.duration._

diff --git a/src/test/scala/com/github/blemale/scaffeine/WeigherSpec.scala b/src/test/scala/com/github/blemale/scaffeine/WeigherSpec.scala
@@ -1,6 +1,7 @@
 package com.github.blemale.scaffeine
 
 import org.scalatest._
+import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
 class WeigherSpec

diff --git a/src/test/scala/com/github/blemale/scaffeine/example/AsyncLoadingCacheExample.scala b/src/test/scala/com/github/blemale/scaffeine/example/AsyncLoadingCacheExample.scala
@@ -1,8 +1,8 @@
 package com.github.blemale.scaffeine.example
 
-import org.scalatest.Matchers
 import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 import scala.concurrent.Future
 

diff --git a/src/test/scala/com/github/blemale/scaffeine/example/CacheExample.scala b/src/test/scala/com/github/blemale/scaffeine/example/CacheExample.scala
@@ -1,7 +1,7 @@
 package com.github.blemale.scaffeine.example
 
-import org.scalatest.Matchers
 import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 class CacheExample
   extends AnyFlatSpec

diff --git a/src/test/scala/com/github/blemale/scaffeine/example/LoadingCacheExample.scala b/src/test/scala/com/github/blemale/scaffeine/example/LoadingCacheExample.scala
@@ -1,7 +1,7 @@
 package com.github.blemale.scaffeine.example
 
-import org.scalatest.Matchers
 import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
 class LoadingCacheExample
   extends AnyFlatSpec