Migrate from scalatest's deprecated ShouldMatchers to Matchers.

Author: nbauernfeind

Diff for: src/test/scala/net/codingwell/scalaguice/BindingExtensionsSpec.scala

@@ -15,12 +15,11 @@
  */
 package net.codingwell.scalaguice
 
-import org.scalatest.WordSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.{Matchers, WordSpec}
 
 import com.google.inject._
 
-class BindingExtensionsSpec extends WordSpec with ShouldMatchers {
+class BindingExtensionsSpec extends WordSpec with Matchers {
 
   import BindingExtensions._
 

Diff for: src/test/scala/net/codingwell/scalaguice/InjectorExtensionsSpec.scala

@@ -15,13 +15,12 @@
  */
 package net.codingwell.scalaguice
 
-import org.scalatest.WordSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.{Matchers, WordSpec}
 
 import com.google.inject._
 import com.google.inject.name.Names.named
 
-class InjectorExtensionsSpec extends WordSpec with ShouldMatchers {
+class InjectorExtensionsSpec extends WordSpec with Matchers {
 
   import InjectorExtensions._
 

Diff for: src/test/scala/net/codingwell/scalaguice/MultibinderSpec.scala

@@ -15,8 +15,7 @@
  */
 package net.codingwell.scalaguice
 
-import org.scalatest.WordSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.{Matchers, WordSpec}
 
 import com.google.inject._
 import com.google.inject.name._
@@ -25,7 +24,7 @@ import java.util.{Set => JSet, HashSet => JHashSet}
 
 import scala.collection.{ immutable => im }
 
-class MultibinderSpec extends WordSpec with ShouldMatchers {
+class MultibinderSpec extends WordSpec with Matchers {
 
   "A multibinder" should {
 //  def newSetBinder[T : Manifest]( binder:Binder, settype:TypeLiteral[T], annotation:Annotation ) = {

Diff for: src/test/scala/net/codingwell/scalaguice/ScalaModuleSpec.scala

@@ -15,12 +15,11 @@
  */
 package net.codingwell.scalaguice
 
-import org.scalatest.WordSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.{Matchers, WordSpec}
 
 import com.google.inject._
 
-class ScalaModuleSpec extends WordSpec with ShouldMatchers {
+class ScalaModuleSpec extends WordSpec with Matchers {
 
   "A Scala Guice module" should {
 

Diff for: src/test/scala/net/codingwell/scalaguice/ScalaPrivateModuleSpec.scala

@@ -15,12 +15,11 @@
  */
 package net.codingwell.scalaguice
 
-import org.scalatest.WordSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.{Matchers, WordSpec}
 
 import com.google.inject._
 
-class ScalaPrivateModuleSpec extends WordSpec with ShouldMatchers {
+class ScalaPrivateModuleSpec extends WordSpec with Matchers {
 
   "A Scala Guice private module" should {
 

Diff for: src/test/scala/net/codingwell/scalaguice/SetProviderSpec.scala

@@ -15,16 +15,15 @@
  */
 package net.codingwell.scalaguice
 
-import org.scalatest.WordSpec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.{Matchers, WordSpec}
 
 import com.google.inject._
 
 import java.util.{Set => JSet, HashSet => JHashSet}
 
 import scala.collection.{ immutable => im }
 
-class SetProviderSpec extends WordSpec with ShouldMatchers {
+class SetProviderSpec extends WordSpec with Matchers {
 
   "A Set Provider" should {
 

Diff for: src/test/scala/net/codingwell/scalaguice/TypeLiteralSpec.scala

@@ -15,10 +15,9 @@
  */
 package net.codingwell.scalaguice
 
-import org.scalatest.Spec
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.{Matchers, FunSpec}
 
-class TypeLiteralSpec extends Spec with ShouldMatchers {
+class TypeLiteralSpec extends FunSpec with Matchers {
 
   import com.google.inject._