Merge pull request #2702 from barambani/fix-bc-error

Reverted binary incompatible changes to generated parallel syntax
typelevel · Jan 22, 2019 · 9e617d8 · 9e617d8
2 parents a332935 + 69356ef
commit 9e617d8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 20 deletions.
diff --git a/binCompatTest/src/main/scala/catsBC/MimaExceptions.scala b/binCompatTest/src/main/scala/catsBC/MimaExceptions.scala
@@ -26,6 +26,7 @@ object MimaExceptions {
     cats.data.EitherT.left[Int](Option("err")),
     true.iterateUntilM(Option(_))(identity _),
     Either.catchOnly[NumberFormatException] { "foo".toInt },
-    (1.validNel[String], 2.validNel[String], 3.validNel[String]) mapN (_ + _ + _)
+    (1.validNel[String], 2.validNel[String], 3.validNel[String]) mapN (_ + _ + _),
+    (1.asRight[String], 2.asRight[String], 3.asRight[String]) parMapN (_ + _ + _)
   )
 }
diff --git a/build.sbt b/build.sbt
@@ -373,26 +373,10 @@ def mimaSettings(moduleName: String) =
           exclude[MissingTypesProblem]("cats.arrow.FunctionKMacros$"),
           exclude[IncompatibleMethTypeProblem]("cats.arrow.FunctionKMacros#Lifter.this"),
           exclude[IncompatibleResultTypeProblem]("cats.arrow.FunctionKMacros#Lifter.c")
-        ) ++ mimaBoilerplateSyntaxExclusions(scalaVersion.value)
+        )
     }
   )
 
-def mimaBoilerplateSyntaxExclusions(scalaVersion: String) = {
-  import com.typesafe.tools.mima.core._
-  import com.typesafe.tools.mima.core.ProblemFilters._
-
-  Seq(
-    exclude[IncompatibleResultTypeProblem]("cats.*.catsSyntaxTuple*Parallel")
-  ) ++ (CrossVersion.partialVersion(scalaVersion) match {
-    case Some((2, 11)) =>
-      Seq(
-        exclude[DirectMissingMethodProblem]("cats.syntax.TupleParallelSyntax.catsSyntaxTuple*Parallel"),
-        exclude[ReversedMissingMethodProblem]("cats.syntax.TupleParallelSyntax.catsSyntaxTuple*Parallel")
-      )
-    case _ => Seq.empty
-  })
-}
-
 lazy val docs = project
   .enablePlugins(MicrositesPlugin)
   .enablePlugins(ScalaUnidocPlugin)

diff --git a/project/Boilerplate.scala b/project/Boilerplate.scala
@@ -404,7 +404,7 @@ object Boilerplate {
          -  implicit def catsSyntaxTuple${arity}Parallel[M[_], ${`A..N`}]($tupleTpe): Tuple${arity}ParallelOps[M, ${`A..N`}] = new Tuple${arity}ParallelOps(t$arity)
       |}
       |
-         -private[syntax] final class Tuple${arity}ParallelOps[M[_], ${`A..N`}](private val $tupleTpe) extends AnyVal {
+         -private[syntax] final class Tuple${arity}ParallelOps[M[_], ${`A..N`}](private val $tupleTpe) {
          -  $parMap
          -  $parTupled
          -}
@@ -470,7 +470,7 @@ object Boilerplate {
         -  implicit def catsSyntaxTuple${arity}Semigroupal[F[_], ${`A..N`}]($tupleTpe): Tuple${arity}SemigroupalOps[F, ${`A..N`}] = new Tuple${arity}SemigroupalOps(t$arity)
       |}
       |
-        -private[syntax] final class Tuple${arity}SemigroupalOps[F[_], ${`A..N`}]($tupleTpe) {
+        -private[syntax] final class Tuple${arity}SemigroupalOps[F[_], ${`A..N`}](private val $tupleTpe) {
         -  $map
         -  $contramap
         -  $imap