Skip to content

Commit

Permalink
update server dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewts129 committed Nov 11, 2022
1 parent 9fe0751 commit 6483755
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 11 deletions.
26 changes: 17 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
val http4sVersion = "0.23.6"
val http4sVersion = "0.23.12"

lazy val commonSettings = {
organization := "io.andrewsmith"
version := "1.2"
scalaVersion := "2.13.7"
scalaVersion := "2.13.10"
}

lazy val client = (project in file("client"))
.settings(commonSettings)
.settings(
name := "website-client",
resourceDirectory in Compile := baseDirectory.value / "dist"
Compile / resourceDirectory := baseDirectory.value / "dist"
)

lazy val server = (project in file("server"))
Expand All @@ -23,13 +23,21 @@ lazy val server = (project in file("server"))
"org.http4s" %% "http4s-blaze-server" % http4sVersion,
"org.http4s" %% "http4s-blaze-client" % http4sVersion,
"org.http4s" %% "http4s-circe" % http4sVersion,
"io.circe" %% "circe-generic" % "0.14.1",
"ch.qos.logback" % "logback-classic" % "1.2.7",
"org.tpolecat" %% "doobie-core" % "1.0.0-RC1",
"org.xerial" % "sqlite-jdbc" % "3.36.0.3",
"org.flywaydb" % "flyway-core" % "8.0.4",
"io.circe" %% "circe-generic" % "0.14.3",
"ch.qos.logback" % "logback-classic" % "1.4.4",
"org.tpolecat" %% "doobie-core" % "1.0.0-RC2",
"org.xerial" % "sqlite-jdbc" % "3.39.3.0",
"org.flywaydb" % "flyway-core" % "9.7.0",
),
addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1")
addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"),
assembly / assemblyMergeStrategy := { // https://github.com/sbt/sbt-assembly/issues/391#issuecomment-981987422
case f if f.endsWith("module-info.class") => MergeStrategy.discard
case "NOTICE" => MergeStrategy.discard
case PathList("META-INF", "LICENSE") => MergeStrategy.discard
case PathList("META-INF", "INDEX.LIST") => MergeStrategy.discard
case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard
case _ => MergeStrategy.deduplicate
}
).enablePlugins(FlywayPlugin)

// loads the server project at sbt startup
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.5
sbt.version=1.8.0
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.0.0")
addSbtPlugin("io.github.davidmweber" % "flyway-sbt" % "7.4.0")
addSbtPlugin("au.com.onegeek" %% "sbt-dotenv" % "2.1.204")

0 comments on commit 6483755

Please sign in to comment.