From 8811d60442d060097027b33784ece9a704458e1d Mon Sep 17 00:00:00 2001 From: vlad Date: Fri, 27 Oct 2017 14:06:37 -0700 Subject: Updating core and domain model --- build.sbt | 4 ++-- src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index e9613ab..3f969e5 100644 --- a/build.sbt +++ b/build.sbt @@ -18,8 +18,8 @@ lazy val core = (project in file(".")) "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.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 67da717..d7d3df5 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala @@ -11,12 +11,12 @@ 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 xyz.driver.pdsuicommon.serialization.PlayJsonSupport._ -import xyz.driver.core.rest.AuthProvider -import scala.util.control._ +import xyz.driver.core.rest.auth.AuthProvider +import scala.util.control._ import scala.util._ trait Directives { -- cgit v1.2.3