From 676ddd423470e58dda711a9363027aad98b74a59 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@driver.xyz>
Date: Fri, 22 Sep 2017 15:32:35 -0700
Subject: Upgrade sbt and slick

---
 build.sbt                                                          | 2 +-
 project/build.properties                                           | 5 +----
 project/plugins.sbt                                                | 2 +-
 src/main/scala/xyz/driver/core/cache.scala                         | 2 +-
 src/main/scala/xyz/driver/core/database/PatchedHsqldbProfile.scala | 7 +++----
 src/main/scala/xyz/driver/core/database/database.scala             | 6 +++---
 src/main/scala/xyz/driver/core/database/package.scala              | 2 +-
 7 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/build.sbt b/build.sbt
index de163c4..400b956 100644
--- a/build.sbt
+++ b/build.sbt
@@ -19,7 +19,7 @@ lazy val core = (project in file("."))
     "com.amazonaws"                % "aws-java-sdk-s3"                 % "1.11.26",
     "com.google.cloud"             % "google-cloud-pubsub"             % "0.17.2-alpha",
     "com.google.cloud"             % "google-cloud-storage"            % "1.6.0",
-    "com.typesafe.slick"           %% "slick"                          % "3.1.1",
+    "com.typesafe.slick"           %% "slick"                          % "3.2.1",
     "com.typesafe"                 % "config"                          % "1.2.1",
     "com.typesafe.scala-logging"   %% "scala-logging"                  % "3.5.0",
     "ch.qos.logback"               % "logback-classic"                 % "1.1.3",
diff --git a/project/build.properties b/project/build.properties
index 4c003f6..b7dd3cb 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,4 +1 @@
-#Activator-generated Properties
-#Wed Jul 06 16:08:49 PDT 2016
-template.uuid=a675a7df-bee3-48df-9eaa-688d99e5814e
-sbt.version=0.13.8
+sbt.version=1.0.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 4da27d0..94ce7f7 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,4 +1,4 @@
 resolvers += "releases" at "https://drivergrp.jfrog.io/drivergrp/releases"
 credentials += Credentials("Artifactory Realm", "drivergrp.jfrog.io", "sbt-publisher", "ANC-d8X-Whm-USS")
 
-addSbtPlugin("xyz.driver" % "sbt-settings" % "0.7.40")
+addSbtPlugin("xyz.driver" % "sbt-settings" % "1.0.1")
diff --git a/src/main/scala/xyz/driver/core/cache.scala b/src/main/scala/xyz/driver/core/cache.scala
index 79ba2d7..a929171 100644
--- a/src/main/scala/xyz/driver/core/cache.scala
+++ b/src/main/scala/xyz/driver/core/cache.scala
@@ -24,7 +24,7 @@ object cache {
     private[this] val underlying = cache.asMap()
 
     private[this] def evictOnFailure(key: K, f: Future[V]): Future[V] = {
-      f onFailure {
+      f.failed foreach {
         case ex: Throwable =>
           log.debug(s"Evict key $key due to exception $ex")
           evict(key, f)
diff --git a/src/main/scala/xyz/driver/core/database/PatchedHsqldbProfile.scala b/src/main/scala/xyz/driver/core/database/PatchedHsqldbProfile.scala
index 1331efc..e2efd32 100644
--- a/src/main/scala/xyz/driver/core/database/PatchedHsqldbProfile.scala
+++ b/src/main/scala/xyz/driver/core/database/PatchedHsqldbProfile.scala
@@ -1,11 +1,10 @@
 package xyz.driver.core.database
 
-import slick.driver.HsqldbDriver
-import slick.jdbc.JdbcType
+import slick.jdbc.{HsqldbProfile, JdbcType}
 import slick.ast.FieldSymbol
-import slick.profile.RelationalProfile
+import slick.relational.RelationalProfile
 
-trait PatchedHsqldbProfile extends HsqldbDriver {
+trait PatchedHsqldbProfile extends HsqldbProfile {
   override def defaultSqlTypeName(tmd: JdbcType[_], sym: Option[FieldSymbol]): String = tmd.sqlType match {
     case java.sql.Types.VARCHAR =>
       val size = sym.flatMap(_.findColumnOption[RelationalProfile.ColumnOption.Length])
diff --git a/src/main/scala/xyz/driver/core/database/database.scala b/src/main/scala/xyz/driver/core/database/database.scala
index 1dd0355..d305eee 100644
--- a/src/main/scala/xyz/driver/core/database/database.scala
+++ b/src/main/scala/xyz/driver/core/database/database.scala
@@ -1,7 +1,7 @@
 package xyz.driver.core
 
-import slick.backend.DatabaseConfig
-import slick.driver.JdbcProfile
+import slick.basic.DatabaseConfig
+import slick.jdbc.JdbcProfile
 import xyz.driver.core.date.Date
 import xyz.driver.core.time.Time
 
@@ -20,7 +20,7 @@ package database {
       val dbConfig: DatabaseConfig[JdbcProfile] = DatabaseConfig.forConfig(databaseName, config)
 
       new Database {
-        val profile: JdbcProfile                   = dbConfig.driver
+        val profile: JdbcProfile                   = dbConfig.profile
         val database: JdbcProfile#Backend#Database = dbConfig.db
       }
     }
diff --git a/src/main/scala/xyz/driver/core/database/package.scala b/src/main/scala/xyz/driver/core/database/package.scala
index b39169d..9385c8f 100644
--- a/src/main/scala/xyz/driver/core/database/package.scala
+++ b/src/main/scala/xyz/driver/core/database/package.scala
@@ -5,7 +5,7 @@ import java.util.Calendar
 
 import date.{Date, Month}
 import slick.dbio._
-import slick.driver.JdbcProfile
+import slick.jdbc.JdbcProfile
 
 package object database {
 
-- 
cgit v1.2.3