diff --git a/modules/store/src/main/scala/docspell/store/impl/StoreImpl.scala b/modules/store/src/main/scala/docspell/store/impl/StoreImpl.scala index 06e63e9b..a0707844 100644 --- a/modules/store/src/main/scala/docspell/store/impl/StoreImpl.scala +++ b/modules/store/src/main/scala/docspell/store/impl/StoreImpl.scala @@ -22,7 +22,7 @@ final class StoreImpl[F[_]: Effect](jdbc: JdbcConfig, xa: Transactor[F]) ) def migrate: F[Int] = - FlywayMigrate.run[F](jdbc) + FlywayMigrate.run[F](jdbc).map(_.migrationsExecuted) def transact[A](prg: doobie.ConnectionIO[A]): F[A] = prg.transact(xa) diff --git a/modules/store/src/main/scala/docspell/store/migrate/FlywayMigrate.scala b/modules/store/src/main/scala/docspell/store/migrate/FlywayMigrate.scala index 7685f22b..5957ff07 100644 --- a/modules/store/src/main/scala/docspell/store/migrate/FlywayMigrate.scala +++ b/modules/store/src/main/scala/docspell/store/migrate/FlywayMigrate.scala @@ -5,12 +5,13 @@ import cats.effect.Sync import docspell.store.JdbcConfig import org.flywaydb.core.Flyway +import org.flywaydb.core.api.output.MigrateResult import org.log4s._ object FlywayMigrate { private[this] val logger = getLogger - def run[F[_]: Sync](jdbc: JdbcConfig): F[Int] = + def run[F[_]: Sync](jdbc: JdbcConfig): F[MigrateResult] = Sync[F].delay { logger.info("Running db migrations...") val locations = jdbc.dbmsName match { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 4e788398..21db7a27 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -14,7 +14,7 @@ object Dependencies { val EmilVersion = "0.6.3" val FastparseVersion = "2.1.3" val FlexmarkVersion = "0.62.2" - val FlywayVersion = "6.5.7" + val FlywayVersion = "7.0.0" val Fs2Version = "2.4.4" val H2Version = "1.4.200" val Http4sVersion = "0.21.7"