Skip to content
This repository was archived by the owner on Sep 16, 2022. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "2.7.5"
version = "3.0.8"

style = defaultWithAlign

Expand Down
29 changes: 14 additions & 15 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@ val scalaV = "3.0.0-RC1"

val catsEffectV = "3.0.2"

val flywayV = "7.8.2"
val flywayV = "7.8.2"

// Test
val specs2V = "4.12.0"
val specs2V = "4.12.0"

val testContainersScalaV = "0.39.4" // https://github.com/testcontainers/testcontainers-scala/releases
val testContainersScalaV = "0.39.4" // https://github.com/testcontainers/testcontainers-scala/releases

val testContainersPostgresV = "1.15.3" // https://github.com/testcontainers/testcontainers-java/releases

val postgresV = "42.2.20"

val postgresV = "42.2.20"

lazy val `flutterby` =
(project in file("."))
Expand Down Expand Up @@ -41,16 +40,16 @@ lazy val `flutterby-cats` = project

lazy val commonSettings = Seq(
organization := "dev.shawngarner",
scalaVersion := scalaV ,
scalaVersion := scalaV,
// scalacOptions ++= Seq(
// "-rewrite",
// "-new-syntax",
// "-source:3.0-migration"
// ),
libraryDependencies ++= Seq(
"org.flywaydb" % "flyway-core" % flywayV,
("org.specs2" %% "specs2-core" % specs2V % Test).cross(CrossVersion.for3Use2_13),
("org.specs2" %% "specs2-scalacheck" % specs2V % Test).cross(CrossVersion.for3Use2_13)
("org.specs2" %% "specs2-core" % specs2V % Test).cross(CrossVersion.for3Use2_13),
("org.specs2" %% "specs2-scalacheck" % specs2V % Test).cross(CrossVersion.for3Use2_13)
)
)

Expand All @@ -60,18 +59,18 @@ lazy val contributors = Seq(

lazy val releaseSettings = Seq(
Test / publishArtifact := false,
scmInfo := Some(
scmInfo := Some(
ScmInfo(
url("https://github.com/BusyByte/flutterby"),
"git@github.com:BusyByte/flutterby.git"
)
),
homepage := Some(url("https://github.com/BusyByte/flutterby")),
licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.html")),
pomIncludeRepository := { _ =>
homepage := Some(url("https://github.com/BusyByte/flutterby")),
licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.html")),
pomIncludeRepository := { _ =>
false
},
pomExtra := {
pomExtra := {
<developers>
{
for ((username, name) <- contributors)
Expand All @@ -87,7 +86,7 @@ lazy val releaseSettings = Seq(

lazy val noPublishSettings =
Seq(
publish := {},
publishLocal := {},
publish := {},
publishLocal := {},
publishArtifact := false
)
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ object FlutterbyCats {
def fromConfig[F[_]](config: Config[F])(
implicit F: Sync[F]
): F[Flutterby[F]] =
for
c <- config.config
flyway <- F.blocking(Flyway.configure(c.getClassLoader).configuration(c).load())
for c <- config.config
flyway <- F.blocking(Flyway.configure(c.getClassLoader).configuration(c).load())
yield new Flutterby[F] {
override def baseline(): F[Unit] = F.blocking(flyway.baseline()).void // TODO: support new model instead of void
override def migrate(): F[Int] = F.blocking(flyway.migrate().migrationsExecuted) // TODO: support new model
Expand Down
Loading