Skip to content

Commit

Permalink
Merge pull request #103 from finagle/postgres-shapeless-release
Browse files Browse the repository at this point in the history
Aggregate finagle-postgres with finagle-postgres-shapeless
  • Loading branch information
leonmaia authored Feb 18, 2019
2 parents ef3fb28 + 64ac2ed commit 25e17e6
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,13 @@ lazy val publishSettings = Seq(

lazy val allSettings = baseSettings ++ buildSettings ++ publishSettings

lazy val shapelessRef = LocalProject("finagle-postgres-shapeless")

lazy val `finagle-postgres` = project.in(file("."))
.settings(moduleName := "finagle-postgres")
.settings(allSettings)
.configs(IntegrationTest)
.aggregate(shapelessRef)

lazy val `finagle-postgres-shapeless` = project
.settings(moduleName := "finagle-postgres-shapeless")
Expand Down Expand Up @@ -113,11 +116,6 @@ parallelExecution in Test := false

javaOptions in Test += "-Duser.timezone=UTC"

test in Test in `finagle-postgres` := {
(test in Test in `finagle-postgres`).value
(test in Test in `finagle-postgres-shapeless`).value
}

scalacOptions ++= Seq(
"-deprecation"
)

0 comments on commit 25e17e6

Please sign in to comment.