aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvlad <vlad@driver.xyz>2018-01-26 11:47:49 -0800
committervlad <vlad@driver.xyz>2018-01-26 11:59:14 -0800
commit5c9a7a364afed97e8def2eb7b4b8a2727a561d3f (patch)
tree0aba0cc258702464d14afee5f82c2db0e73b03ba
parent31b0f7c737b0a6fc637a34cf933475aabd0a42b8 (diff)
downloadrest-query-5c9a7a364afed97e8def2eb7b4b8a2727a561d3f.tar.gz
rest-query-5c9a7a364afed97e8def2eb7b4b8a2727a561d3f.tar.bz2
rest-query-5c9a7a364afed97e8def2eb7b4b8a2727a561d3f.zip
Dropping the Scala 2.11 supportv1.0.1
(cherry picked from commit 4d37891)
-rw-r--r--build.sbt18
-rw-r--r--project/plugins.sbt2
-rw-r--r--src/main/scala/xyz/driver/restquery/db/SlickQueryBuilder.scala13
3 files changed, 18 insertions, 15 deletions
diff --git a/build.sbt b/build.sbt
index 0ca1f7d..c6be4bd 100644
--- a/build.sbt
+++ b/build.sbt
@@ -6,13 +6,13 @@ lazy val core = (project in file("."))
.settings(lintingSettings ++ formatSettings)
.settings(sources in (Compile, doc) := Seq.empty, publishArtifact in (Compile, packageDoc) := false)
.settings(libraryDependencies ++= Seq(
- "com.typesafe.akka" %% "akka-http" % "10.0.10",
- "com.lihaoyi" %% "fastparse" % "1.0.0",
- "xyz.driver" %% "core" % "1.6.12",
- "com.typesafe.scala-logging" %% "scala-logging" % "3.5.0",
- "org.slf4j" % "slf4j-api" % "1.7.21",
- "ch.qos.logback" % "logback-classic" % "1.1.7",
- "com.typesafe" % "config" % "1.3.0",
- "org.scalacheck" %% "scalacheck" % "1.13.4" % "test",
- "org.scalatest" %% "scalatest" % "3.0.1" % "test"
+ "com.typesafe.akka" %% "akka-http" % "10.0.10",
+ "com.lihaoyi" %% "fastparse" % "1.0.0",
+ "xyz.driver" %% "core" % "1.6.12",
+ "com.typesafe.scala-logging" %% "scala-logging" % "3.5.0",
+ "org.slf4j" % "slf4j-api" % "1.7.21",
+ "ch.qos.logback" % "logback-classic" % "1.1.7",
+ "com.typesafe" % "config" % "1.3.0",
+ "org.scalacheck" %% "scalacheck" % "1.13.4" % "test",
+ "org.scalatest" %% "scalatest" % "3.0.1" % "test"
))
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 1ef8b09..ae21eba 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,3 +1,3 @@
resolvers += "releases" at "https://drivergrp.jfrog.io/drivergrp/releases"
-addSbtPlugin("xyz.driver" % "sbt-settings" % "1.0.6")
+addSbtPlugin("xyz.driver" % "sbt-settings" % "1.0.7")
diff --git a/src/main/scala/xyz/driver/restquery/db/SlickQueryBuilder.scala b/src/main/scala/xyz/driver/restquery/db/SlickQueryBuilder.scala
index 67ce9f4..2947b3c 100644
--- a/src/main/scala/xyz/driver/restquery/db/SlickQueryBuilder.scala
+++ b/src/main/scala/xyz/driver/restquery/db/SlickQueryBuilder.scala
@@ -3,7 +3,7 @@ package xyz.driver.restquery.db
import java.sql.{JDBCType, PreparedStatement}
import java.time.LocalDateTime
-import slick.jdbc.{JdbcProfile, PositionedParameters, SQLActionBuilder, SetParameter}
+import slick.jdbc._
import xyz.driver.restquery.query._
import scala.concurrent.{ExecutionContext, Future}
@@ -30,10 +30,13 @@ object SlickQueryBuilder {
implicit class SQLActionBuilderConcat(a: SQLActionBuilder) {
def concat(b: SQLActionBuilder): SQLActionBuilder = {
- SQLActionBuilder(a.queryParts ++ b.queryParts, (p: Unit, pp: PositionedParameters) => {
- a.unitPConv.apply(p, pp)
- b.unitPConv.apply(p, pp)
- })
+ SQLActionBuilder(
+ a.queryParts ++ b.queryParts,
+ (p: Unit, pp: PositionedParameters) => {
+ a.unitPConv.apply(p, pp)
+ b.unitPConv.apply(p, pp)
+ }
+ )
}
}