Merge pull request #78 from jozic/patch-1

bump scala 2.13 to latest milestone (M5)

Author: ultrasecreth

build.sbt

@@ -19,13 +19,12 @@ lazy val commonSettings =
       source.close
       version.get
     },
-    crossScalaVersions := Seq("2.11.12", "2.12.8", "2.13.0-M2"),
+    crossScalaVersions := Seq("2.11.12", "2.12.8", "2.13.0-M5"),
     scalacOptions ++= Seq(
       "-unchecked",
       "-feature",
       "-deprecation:false",
       "-encoding", "UTF-8",
-      "-Ypartial-unification",
       "-language:higherKinds",
       "-Xfatal-warnings",
       "-language:reflectiveCalls",
@@ -35,9 +34,9 @@ lazy val commonSettings =
 
 lazy val commonLibraries = Seq(
   "org.mockito"   % "mockito-core"      % "2.24.0",
-  "org.scalactic" %% "scalactic"        % "3.0.5",
+  "org.scalactic" %% "scalactic"        % "3.0.6-SNAP6",
   "ru.vyarus"     % "generics-resolver" % "3.0.0",
-  "org.scalatest" %% "scalatest"        % "3.0.5" % "provided",
+  "org.scalatest" %% "scalatest"        % "3.0.6-SNAP6" % "provided",
 )
 
 lazy val common = (project in file("common"))

common/src/main/scala/org/mockito/matchers/package.scala renamed to common/src/main/scala-2.11/org/mockito/matchers/package.scala

@@ -0,0 +1,13 @@
+package org.mockito
+import scala.collection.mutable
+
+package object matchers {
+  trait VarargAwareArgumentMatcher[T] extends ArgumentMatcher[T] {
+    override def matches(argument: T): Boolean = argument match {
+      case a: mutable.WrappedArray[_] if a.length == 1 => doesMatch(a.head.asInstanceOf[T])
+      case other => doesMatch(other)
+    }
+
+    def doesMatch(argument: T): Boolean
+  }
+}

common/src/main/scala-2.12/org/mockito/matchers/package.scala

@@ -0,0 +1,13 @@
+package org.mockito
+import scala.collection.immutable.ArraySeq
+
+package object matchers {
+  trait VarargAwareArgumentMatcher[T] extends ArgumentMatcher[T] {
+    override def matches(argument: T): Boolean = argument match {
+      case a: ArraySeq[_] if a.length == 1 => doesMatch(a.head.asInstanceOf[T])
+      case other => doesMatch(other)
+    }
+
+    def doesMatch(argument: T): Boolean
+  }
+}

common/src/main/scala-2.13.0-M5/org/mockito/matchers/package.scala

@@ -4,7 +4,7 @@ import org.mockito.internal.ValueClassExtractor
 import org.mockito.{ArgumentMatcher, ArgumentMatchers => JavaMatchers}
 import org.scalactic.Equality
 
-import scala.collection.mutable
+import scala.collection.immutable.ArraySeq
 
 trait EqMatchers_213 {
 
@@ -16,7 +16,7 @@ trait EqMatchers_213 {
     val rawValues: Seq[T] = Seq(value) ++ others
     JavaMatchers.argThat(new ArgumentMatcher[T] {
       override def matches(v: T): Boolean = v match {
-        case a: mutable.WrappedArray[_] if rawValues.length == a.length =>
+        case a: ArraySeq[_] if rawValues.length == a.length =>
           (rawValues zip a) forall {
             case (expected, got) => $eq.areEqual(expected.asInstanceOf[T], got)
           }