diff options
| author | Marvin Bertin <marvin.bertin@gmail.com> | 2017-10-10 17:17:18 -0700 |
|---|---|---|
| committer | Marvin Bertin <marvin.bertin@gmail.com> | 2017-10-10 17:17:18 -0700 |
| commit | b124608a4faa9cb94474f27c1d4605e5cb0ab63d (patch) | |
| tree | c3439f756f023facbbae4deea1972ad2f511dda3 /build.sbt | |
| parent | f55212361d6126a05075a1f00f3915484b4f334e (diff) | |
| parent | 385a9a99e5a95c3d623cddd927c37564e32dbd2d (diff) | |
| download | rest-query-b124608a4faa9cb94474f27c1d4605e5cb0ab63d.tar.gz rest-query-b124608a4faa9cb94474f27c1d4605e5cb0ab63d.tar.bz2 rest-query-b124608a4faa9cb94474f27c1d4605e5cb0ab63d.zip | |
fix merge conflictsv0.7.5
Diffstat (limited to 'build.sbt')
| -rw-r--r-- | build.sbt | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -11,15 +11,15 @@ 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", "io.github.cloudify" %% "spdf" % "1.4.0", "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" %% "core" % "1.2.2", + "xyz.driver" %% "domain-model" % "0.17.8", "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", |