Address binary compatibility issues

rallyhealth · Jul 20, 2021 · 71a6e3b · 71a6e3b
1 parent 7bc089c
commit 71a6e3b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/core/src/main/scala/org/scalacheck/ops/ScalaCheckImplicits.scala b/core/src/main/scala/org/scalacheck/ops/ScalaCheckImplicits.scala
@@ -1,16 +1,16 @@
 package org.scalacheck.ops
 
 import org.scalacheck.Gen
-import org.scalacheck.ops.time.{ImplicitJavaTimeGenerators, JavaTimeImplicits, TruncatedJavaTimeImplicits}
+import org.scalacheck.ops.time.{ImplicitJavaTimeGenerators, JavaTimeImplicits}
 
 import scala.language.implicitConversions
 import scala.reflect.ClassTag
 
+// TODO: Move everything to the package object to prevent inheritance here. It is bad for binary compatibility.
+@deprecated("Don't extend ScalaCheckImplicits. Import from org.scalacheck.ops._ instead.", "2.7.0")
 trait ScalaCheckImplicits
   extends ArbitraryAsGen
-  with ImplicitGenFromConfig
   with JavaTimeImplicits
-  with TruncatedJavaTimeImplicits
   with ImplicitJavaTimeGenerators
   with ShrinkLargeTuples {
 

diff --git a/core/src/main/scala/org/scalacheck/ops/TypeName.scala b/core/src/main/scala/org/scalacheck/ops/TypeName.scala
@@ -6,7 +6,9 @@ import scala.annotation.implicitNotFound
 import scala.reflect.ClassTag
 
 @implicitNotFound(
-  "Could not grab the type name of ${T} at compile-time... except for printing this error message (go figure). " +
+  // Splitting the $ and {T} to avoid a false missing interpolator compiler warning
+  // see https://stackoverflow.com/questions/39401213/disable-false-warning-possible-missing-interpolator
+  "Could not grab the type name of $" + "{T} at compile-time... except for printing this error message (go figure). " +
     "This means that neither a ClassTag nor izumi.reflect.Tag could not be summoned for this type.")
 final class TypeName[T] private (val typeName: String)
 

diff --git a/core/src/main/scala/org/scalacheck/ops/package.scala b/core/src/main/scala/org/scalacheck/ops/package.scala
@@ -1,7 +1,12 @@
 package org.scalacheck
 
+import org.scalacheck.ops.time.TruncatedJavaTimeImplicits
+
 /**
   * @note if you would like joda DateTime implicits to be included (as they were in past versions of scalacheck-ops),
   *       you will need to include the scalacheck-ops-joda library and import org.scalacheck.ops.time.joda._.
   */
-package object ops extends ScalaCheckImplicits
+package object ops
+  extends ScalaCheckImplicits
+    with ImplicitGenFromConfig
+    with TruncatedJavaTimeImplicits
diff --git a/core/src/test/scala/org/scalacheck/ops/NewtypeExample.scala b/core/src/test/scala/org/scalacheck/ops/NewtypeExample.scala
@@ -3,7 +3,7 @@ package org.scalacheck.ops
 import io.estatico.newtype.macros.{newsubtype, newtype}
 
 object NewtypeExample {
-  import scala.language.implicitConversions
+  import scala.language.{higherKinds, implicitConversions}
 
   @newtype class IdType(id: String)
   @newsubtype class IdSubtype(id: String)