From b683f6b0007578a3c576d5d77a16e79a49c3e2bc Mon Sep 17 00:00:00 2001 From: Antonio Gelameris Date: Fri, 7 Oct 2022 13:07:05 +0200 Subject: [PATCH 1/2] Recreated compat as a package object --- .../main/scala/cats/{compat.scala => compat/package.scala} | 6 ++++-- mima.sbt | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) rename core/src/main/scala-3/src/main/scala/cats/{compat.scala => compat/package.scala} (91%) diff --git a/core/src/main/scala-3/src/main/scala/cats/compat.scala b/core/src/main/scala-3/src/main/scala/cats/compat/package.scala similarity index 91% rename from core/src/main/scala-3/src/main/scala/cats/compat.scala rename to core/src/main/scala-3/src/main/scala/cats/compat/package.scala index f324e9fc4d..1cc8b9ecc4 100644 --- a/core/src/main/scala-3/src/main/scala/cats/compat.scala +++ b/core/src/main/scala-3/src/main/scala/cats/compat/package.scala @@ -19,6 +19,8 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package cats.compat +package cats -private[cats] type targetName = scala.annotation.targetName +package object compat { + private[cats] type targetName = scala.annotation.targetName +} diff --git a/mima.sbt b/mima.sbt index 67d4cf5c9e..79d116bd3c 100644 --- a/mima.sbt +++ b/mima.sbt @@ -145,6 +145,10 @@ ThisBuild / mimaBinaryIssueFilters ++= { exclude[ReversedAbstractMethodProblem]("cats.free.ContravariantCoyoneda.k"), exclude[DirectAbstractMethodProblem]("cats.free.Coyoneda.k"), exclude[ReversedAbstractMethodProblem]("cats.free.Coyoneda.k") + ) ++ // https://github.com/typelevel/cats/issues/4304 + Seq( + exclude[MissingClassProblem]("cats.compat.compat$package"), + exclude[MissingClassProblem]("cats.compat.compat$package$") ) } From f7e0d3ef680ca394ed00f1378f589ab5279e25b8 Mon Sep 17 00:00:00 2001 From: Antonio Gelameris Date: Fri, 7 Oct 2022 13:15:27 +0200 Subject: [PATCH 2/2] Fixed pull request pointer in mima.sbt --- mima.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mima.sbt b/mima.sbt index 79d116bd3c..6581068fea 100644 --- a/mima.sbt +++ b/mima.sbt @@ -145,7 +145,7 @@ ThisBuild / mimaBinaryIssueFilters ++= { exclude[ReversedAbstractMethodProblem]("cats.free.ContravariantCoyoneda.k"), exclude[DirectAbstractMethodProblem]("cats.free.Coyoneda.k"), exclude[ReversedAbstractMethodProblem]("cats.free.Coyoneda.k") - ) ++ // https://github.com/typelevel/cats/issues/4304 + ) ++ // https://github.com/typelevel/cats/pull/4315 Seq( exclude[MissingClassProblem]("cats.compat.compat$package"), exclude[MissingClassProblem]("cats.compat.compat$package$")