Drop EqMatchers_VersionSpecific (they aren't specific) (#575)

Author: jozic

common/src/main/scala/org/mockito/matchers/EqMatchers.scala

@@ -1,7 +1,9 @@
 package org.mockito
 package matchers
 
+import org.mockito.internal.ValueClassExtractor
 import org.mockito.{ ArgumentMatchers => JavaMatchers }
+import org.scalactic.{ Equality, Prettifier }
 
 import scala.reflect.ClassTag
 
@@ -21,4 +23,13 @@ private[mockito] trait EqMatchers {
    * Delegates to <code>ArgumentMatchers.refEq()</code>, it's only here so we expose all the `ArgumentMatchers` on a single place
    */
   def refEq[T](value: T, excludeFields: String*): T = JavaMatchers.refEq(value, excludeFields: _*)
+
+  /**
+   * Creates a matcher that delegates on {{org.scalactic.Equality}} so you can always customise how the values are compared Also works with value classes
+   */
+  def eqTo[T: Equality: ValueClassExtractor](value: T)(implicit $pt: Prettifier): T = {
+    JavaMatchers.argThat(new EqTo[T](value))
+    value
+  }
+
 }

core/src/main/scala-2.12/org/mockito/matchers/EqMatchers_VersionSpecific.scala

@@ -25,7 +25,6 @@ import org.mockito.matchers._
 trait ArgumentMatchersSugar
     extends AnyMatchers
     with EqMatchers
-    with EqMatchers_VersionSpecific
     with ThatMatchers
     with StringThatMatchers
     with NullMatchers