Fix MiMa problems

geirolz · Feb 12, 2024 · 22f9d64 · 22f9d64
1 parent 20c6e9b
commit 22f9d64
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,5 +1,6 @@
 import sbt.project
 import ModuleMdocPlugin.autoImport.mdocScalacOptions
+import com.typesafe.tools.mima.core.{DirectMissingMethodProblem, ProblemFilters}
 
 lazy val prjName                = "fly4s"
 lazy val prjPackageName         = prjName.replaceAll("[^\\p{Alpha}\\d]+", ".")
@@ -42,6 +43,11 @@ lazy val core: Project =
     publishAs          = Some(prjName),
     mimaCompatibleWith = Set("1.0.0")
   ).settings(
+    mimaBinaryIssueFilters ++= Seq(
+      ProblemFilters.exclude[DirectMissingMethodProblem]("fly4s.data.Fly4sConfig.apply"),
+      ProblemFilters.exclude[DirectMissingMethodProblem]("fly4s.data.Fly4sConfig.copy"),
+      ProblemFilters.exclude[DirectMissingMethodProblem]("fly4s.data.Fly4sConfig.this")
+    ),
     libraryDependencies ++= {
       CrossVersion.partialVersion(Keys.scalaVersion.value) match {
         case Some((2, _)) => ProjectDependencies.for2_13_Only

diff --git a/core/src/main/scala-2/fly4s/data/Fly4sConfig.scala b/core/src/main/scala-2/fly4s/data/Fly4sConfig.scala
@@ -13,7 +13,6 @@ case class Fly4sConfig(
   defaultSchemaName: Option[String]         = defaultDefaultSchemaName,
   schemaNames: Option[NonEmptyList[String]] = defaultSchemaNames,
   lockRetryCount: Int                       = defaultLockRetryCount,
-  loggers: List[LoggerType]                 = defaultLoggers,
   // --- migrations ---
   installedBy: Option[String]                    = defaultInstalledBy,
   locations: List[Location]                      = defaultLocations,
@@ -50,6 +49,8 @@ case class Fly4sConfig(
   baselineOnMigrate: Boolean       = defaultBaselineOnMigrate,
   outOfOrder: Boolean              = defaultOutOfOrder,
   skipDefaultCallbacks: Boolean    = defaultSkipDefaultCallbacks,
-  skipDefaultResolvers: Boolean    = defaultSkipDefaultResolvers
+  skipDefaultResolvers: Boolean    = defaultSkipDefaultResolvers,
+  // --- mima after 1.0.0 ---
+  loggers: List[LoggerType] = defaultLoggers
 ) extends Fly4sConfigContract
 object Fly4sConfig extends Fly4sConfigBuilder
diff --git a/core/src/main/scala-3/fly4s/data/Fly4sConfig.scala b/core/src/main/scala-3/fly4s/data/Fly4sConfig.scala
@@ -12,7 +12,6 @@ case class Fly4sConfig(
   defaultSchemaName: Option[String]         = defaultDefaultSchemaName,
   schemaNames: Option[NonEmptyList[String]] = defaultSchemaNames,
   lockRetryCount: Int                       = defaultLockRetryCount,
-  loggers: List[LoggerType]                 = defaultLoggers,
   // --- migrations ---
   installedBy: Option[String]                    = defaultInstalledBy,
   locations: List[Location]                      = defaultLocations,
@@ -49,7 +48,9 @@ case class Fly4sConfig(
   baselineOnMigrate: Boolean       = defaultBaselineOnMigrate,
   outOfOrder: Boolean              = defaultOutOfOrder,
   skipDefaultCallbacks: Boolean    = defaultSkipDefaultCallbacks,
-  skipDefaultResolvers: Boolean    = defaultSkipDefaultResolvers
+  skipDefaultResolvers: Boolean    = defaultSkipDefaultResolvers,
+  // --- mima after 1.0.0 ---
+  loggers: List[LoggerType] = defaultLoggers
 ) extends Fly4sConfigContract
 object Fly4sConfig extends Fly4sConfigBuilder: