diff options
| author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-10-30 16:00:44 +0700 |
|---|---|---|
| committer | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-10-30 16:00:44 +0700 |
| commit | d92a2795a02b9711aa9aed92a770f85377b31460 (patch) | |
| tree | fd846d42448b2d3f432056898f0c3433475ea0da | |
| parent | a8882aebc2f9ebe5c0d2503d7fbab2a320b6c0d3 (diff) | |
| parent | 8811d60442d060097027b33784ece9a704458e1d (diff) | |
| download | rest-query-d92a2795a02b9711aa9aed92a770f85377b31460.tar.gz rest-query-d92a2795a02b9711aa9aed92a770f85377b31460.tar.bz2 rest-query-d92a2795a02b9711aa9aed92a770f85377b31460.zip | |
Merge branch 'master' into PDSUI-2336
| -rw-r--r-- | build.sbt | 4 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala | 5 |
2 files changed, 4 insertions, 5 deletions
@@ -15,8 +15,8 @@ lazy val core = (project in file(".")) "com.typesafe.scala-logging" %% "scala-logging" % "3.5.0", "io.getquill" %% "quill-jdbc" % "1.2.1", "io.github.cloudify" %% "spdf" % "1.4.0", - "xyz.driver" %% "core" % "1.2.3", - "xyz.driver" %% "domain-model" % "0.17.8", + "xyz.driver" %% "core" % "1.5.1", + "xyz.driver" %% "domain-model" % "0.18.1", "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", diff --git a/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala b/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala index c3c60bd..4f5cd8a 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala @@ -11,12 +11,11 @@ import xyz.driver.pdsuicommon.error._ import xyz.driver.pdsuicommon.error.DomainError._ import xyz.driver.pdsuicommon.error.ErrorsResponse.ResponseError import xyz.driver.pdsuicommon.parsers._ -import xyz.driver.pdsuicommon.db.{Pagination, Sorting, SearchFilterExpr} +import xyz.driver.pdsuicommon.db.{Pagination, SearchFilterExpr, Sorting} import xyz.driver.pdsuicommon.domain._ import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._ -import xyz.driver.core.rest.AuthProvider +import xyz.driver.core.rest.auth.AuthProvider import scala.util.control._ - import scala.util._ trait Directives { |