Skip to content

Commit

Permalink
Added support for Scala 2.12 and upgraded SBT to 0.13.13
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielaSfregola committed Jan 4, 2017
1 parent 216eb1b commit ae48112
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 12 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
language: scala

jdk:
- oraclejdk8

scala:
- 2.11.8
- 2.12.1

script:
- sbt clean coverage test coverageReport
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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._

Expand All @@ -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._

Expand Down
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -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"))

Expand All @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.11
sbt.version=0.13.13
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.2.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
2 changes: 1 addition & 1 deletion src/test/scala/slickless/GenShapeSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/slickless/HListShapeSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/userapp/LargeSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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._

Expand Down

0 comments on commit ae48112

Please sign in to comment.