From ae48112b1876b7bbe156f4632fa03f3f3e4e392f Mon Sep 17 00:00:00 2001
From: DanielaSfregola <daniela.sfregola@gmail.com>
Date: Wed, 4 Jan 2017 11:04:41 +0000
Subject: [PATCH] Added support for Scala 2.12 and upgraded SBT to 0.13.13

---
 .travis.yml                                   |  4 ++++
 README.md                                     |  4 ++--
 build.sbt                                     | 10 +++++-----
 project/build.properties                      |  2 +-
 project/plugins.sbt                           |  2 +-
 src/test/scala/slickless/GenShapeSpec.scala   |  2 +-
 src/test/scala/slickless/HListShapeSpec.scala |  2 +-
 src/test/scala/userapp/LargeSpec.scala        |  2 +-
 8 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2ce67ba..c1e86ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,11 @@
 language: scala
 
+jdk:
+- oraclejdk8
+
 scala:
 - 2.11.8
+- 2.12.1
 
 script:
 - sbt clean coverage test coverageReport
diff --git a/README.md b/README.md
index fadf279..43db009 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Import Slick, shapeless, and slickless,
 and you should be able to define `Tables` on any shapeless `HList` type:
 
 ~~~ scala
-import slick.driver.H2Driver.api._
+import slick.jdbc.H2Profile.api._
 import shapeless.{ HList, ::, HNil }
 import slickless._
 
@@ -52,7 +52,7 @@ If you want to map your `HList` to a case class
 you can do the following
 
 ~~~ scala
-import slick.driver.H2Driver.api._
+import slick.jdbc.H2Profile.api._
 import shapeless.{ HList, ::, HNil, Generic }
 import slickless._
 
diff --git a/build.sbt b/build.sbt
index 01be99d..cbc1886 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,7 @@
 name         := "slickless"
 organization := "io.underscore"
-version      := "0.3.0"
-scalaVersion := "2.11.8"
+version      := "0.3.1"
+scalaVersion := "2.12.1"
 
 licenses += ("Apache-2.0", url("http://apache.org/licenses/LICENSE-2.0"))
 
@@ -18,9 +18,9 @@ scalacOptions ++= Seq(
 )
 
 libraryDependencies ++= Seq(
-  "com.typesafe.slick" %% "slick"           % "3.1.1",
-  "com.chuusai"        %% "shapeless"       % "2.3.1",
-  "org.scalatest"      %% "scalatest"       % "2.2.5"   % "test",
+  "com.typesafe.slick" %% "slick"           % "3.2.0-M2",
+  "com.chuusai"        %% "shapeless"       % "2.3.2",
+  "org.scalatest"      %% "scalatest"       % "3.0.1"   % "test",
   "com.h2database"      % "h2"              % "1.4.191" % "test",
   "ch.qos.logback"      % "logback-classic" % "1.1.7"   % "test"
 )
diff --git a/project/build.properties b/project/build.properties
index 43b8278..27e88aa 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.11
+sbt.version=0.13.13
diff --git a/project/plugins.sbt b/project/plugins.sbt
index a546739..806d223 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.2.0")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
diff --git a/src/test/scala/slickless/GenShapeSpec.scala b/src/test/scala/slickless/GenShapeSpec.scala
index 6c6f9e0..e3d7111 100644
--- a/src/test/scala/slickless/GenShapeSpec.scala
+++ b/src/test/scala/slickless/GenShapeSpec.scala
@@ -4,7 +4,7 @@ import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.time.{Millis, Seconds, Span}
 import org.scalatest.{FreeSpec, Matchers}
 import shapeless.{::, HNil, Generic}
-import slick.driver.H2Driver.api._
+import slick.jdbc.H2Profile.api._
 
 import scala.concurrent.ExecutionContext.Implicits.global
 
diff --git a/src/test/scala/slickless/HListShapeSpec.scala b/src/test/scala/slickless/HListShapeSpec.scala
index ab45718..67dade6 100644
--- a/src/test/scala/slickless/HListShapeSpec.scala
+++ b/src/test/scala/slickless/HListShapeSpec.scala
@@ -4,7 +4,7 @@ import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.time.{Millis, Seconds, Span}
 import org.scalatest.{FreeSpec, Matchers}
 import shapeless.{::, HNil}
-import slick.driver.H2Driver.api._
+import slick.jdbc.H2Profile.api._
 
 import scala.concurrent.ExecutionContext.Implicits.global
 
diff --git a/src/test/scala/userapp/LargeSpec.scala b/src/test/scala/userapp/LargeSpec.scala
index c4d7456..8e622aa 100644
--- a/src/test/scala/userapp/LargeSpec.scala
+++ b/src/test/scala/userapp/LargeSpec.scala
@@ -2,7 +2,7 @@ package userapp
 
 /* Ensure slickless compiles for large case classes with a nice set of imports. */
 
-import slick.driver.H2Driver.api._
+import slick.jdbc.H2Profile.api._
 import shapeless._
 import slickless._