From 635612550076546c12f8dc6c6654b353acb1d432 Mon Sep 17 00:00:00 2001 From: FlorinAcsinte Date: Sun, 12 May 2024 17:04:45 +0300 Subject: [PATCH] upgrade flyway and cats versions --- build.sbt | 4 ++-- .../main/scala/busymachines/pureharm/db/flyway/Flyway.scala | 5 +++-- .../main/scala/busymachines/pureharm/db/flyway/Flyway.scala | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index a097ac2..52d52c6 100644 --- a/build.sbt +++ b/build.sbt @@ -88,9 +88,9 @@ ThisBuild / resolvers += Resolver.sonatypeRepo("snapshots") val pureharmCoreV = "0.3.0" //https://github.com/busymachines/pureharm-core/releases val pureharmDBCoreV = "0.5.0" //https://github.com/busymachines/pureharm-db-core/releases val pureharmDBCoreJDBCV = "0.6.0" //https://github.com/busymachines/pureharm-db-core-jdbc/releases -val catsEffectV = "3.2.1" //https://github.com/typelevel/cats-effect/releases +val catsEffectV = "3.5.4" //https://github.com/typelevel/cats-effect/releases val catsEffect2V = "2.5.2" //https://github.com/typelevel/cats-effect/releases -val flywayV = "7.12.0" //java — https://github.com/flyway/flyway/releases +val flywayV = "10.12.0" //java — https://github.com/flyway/flyway/releases // format: on //============================================================================= //============================== Project details ============================== diff --git a/db-flyway-ce2/src/main/scala/busymachines/pureharm/db/flyway/Flyway.scala b/db-flyway-ce2/src/main/scala/busymachines/pureharm/db/flyway/Flyway.scala index 82d52f6..a6a7470 100644 --- a/db-flyway-ce2/src/main/scala/busymachines/pureharm/db/flyway/Flyway.scala +++ b/db-flyway-ce2/src/main/scala/busymachines/pureharm/db/flyway/Flyway.scala @@ -74,9 +74,10 @@ object Flyway { if (c.schemas.nonEmpty) { fwConfig.schemas(c.schemas: _*) } - fwConfig.ignoreMissingMigrations(c.ignoreMissingMigrations) + if (c.ignoreMissingMigrations) { + fwConfig.ignoreMigrationPatterns("*:missing") + } fwConfig.cleanOnValidationError(c.cleanOnValidationError) - } new JFlyway(fwConfig) diff --git a/db-flyway/src/main/scala/busymachines/pureharm/db/flyway/Flyway.scala b/db-flyway/src/main/scala/busymachines/pureharm/db/flyway/Flyway.scala index 82d52f6..a6a7470 100644 --- a/db-flyway/src/main/scala/busymachines/pureharm/db/flyway/Flyway.scala +++ b/db-flyway/src/main/scala/busymachines/pureharm/db/flyway/Flyway.scala @@ -74,9 +74,10 @@ object Flyway { if (c.schemas.nonEmpty) { fwConfig.schemas(c.schemas: _*) } - fwConfig.ignoreMissingMigrations(c.ignoreMissingMigrations) + if (c.ignoreMissingMigrations) { + fwConfig.ignoreMigrationPatterns("*:missing") + } fwConfig.cleanOnValidationError(c.cleanOnValidationError) - } new JFlyway(fwConfig)