aboutsummaryrefslogtreecommitdiff
path: root/build.sbt
diff options
context:
space:
mode:
authorMarvin Bertin <marvin.bertin@gmail.com>2017-10-10 11:22:11 -0700
committerMarvin Bertin <marvin.bertin@gmail.com>2017-10-10 11:22:11 -0700
commit05aa114cfd22228f0457b6457ce441af5eabfc60 (patch)
tree62acecf547f01ca4d69fcd4c7c911e0899e9d96c /build.sbt
parent0be360064e7b46eb0ebeac3bfde09d5e80c21d81 (diff)
parent6751966577c0f005858f372458ccdb72be7d879f (diff)
downloadrest-query-05aa114cfd22228f0457b6457ce441af5eabfc60.tar.gz
rest-query-05aa114cfd22228f0457b6457ce441af5eabfc60.tar.bz2
rest-query-05aa114cfd22228f0457b6457ce441af5eabfc60.zip
Merge branch 'master' into trial-46-disease-entity
Diffstat (limited to 'build.sbt')
-rw-r--r--build.sbt4
1 files changed, 2 insertions, 2 deletions
diff --git a/build.sbt b/build.sbt
index 66c0f7b..bebf2aa 100644
--- a/build.sbt
+++ b/build.sbt
@@ -11,7 +11,7 @@ lazy val core = (project in file("."))
"com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.8.3",
"com.github.pureconfig" %% "pureconfig" % "0.7.2",
"com.lihaoyi" %% "fastparse" % "0.3.7",
- "com.typesafe.akka" %% "akka-http" % "10.0.9",
+ "com.typesafe.akka" %% "akka-http" % "10.0.10",
"com.typesafe.play" %% "play" % "2.5.15",
"com.typesafe.scala-logging" %% "scala-logging" % "3.5.0",
"io.getquill" %% "quill-jdbc" % "1.2.1",
@@ -19,7 +19,7 @@ lazy val core = (project in file("."))
"org.davidbild" %% "tristate-core" % "0.2.0",
"org.davidbild" %% "tristate-play" % "0.2.0" exclude ("com.typesafe.play", "play-json"),
"xyz.driver" %% "core" % "1.2.1",
- "xyz.driver" %% "domain-model" % "0.17.1",
+ "xyz.driver" %% "domain-model" % "0.17.5",
"ch.qos.logback" % "logback-classic" % "1.1.7",
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.8.4",
"com.github.spullara.mustache.java" % "scala-extensions-2.11" % "0.9.4",