Add 2.11 cross build

nafg · Jul 29, 2014 · e387766 · e387766
1 parent f29129c
commit e387766
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: scala
-script: sbt test publish coveralls package
+script: sbt +test +publish +coveralls +package
 env:
   global:
     secure: APrQBWcOM2kkihTSSPIEiPEAIiM1Gi1HLNK6Sz/cBtRttXVnMUr7CHU9hbPKtJP94iYmc3gZKY5YjZVG7oKh1B3hUx7booHMPS0fyaC0bxUwRLSWIrav+c2cTzwYvoKz4smS81njrq+i4F/g/+05jqsiwSu7bpjiueiXjROXLZk=

diff --git a/build.sbt b/build.sbt
@@ -1,12 +1,12 @@
-scalaVersion := "2.10.4"
+crossScalaVersions := Seq("2.10.4", "2.11.2")
 
 libraryDependencies += "com.typesafe.slick" %% "slick" % "2.1.0-RC3"
 
 name := "slick-additions"
 
 organization := "io.github.nafg"
 
-libraryDependencies += "org.scalatest" %% "scalatest" % "2.0.M6-SNAP5" % "test"
+libraryDependencies += "org.scalatest" %% "scalatest" % "2.2.0" % "test"
 
 libraryDependencies += "com.h2database" % "h2" % "1.3.170" % "test"
 

diff --git a/src/main/scala/scala/slick/additions/KeyedTableComponent.scala b/src/main/scala/scala/slick/additions/KeyedTableComponent.scala
@@ -185,7 +185,7 @@ trait KeyedTableComponent extends JdbcDriver {
 
       def deleteQuery(keep: Seq[K2]) =
         query.filter {
-          case t: T2 with simple.EntityTable[K2, V2] =>
+          case t: simple.EntityTable[K2, V2] =>
             implicit def tm: BaseColumnType[K2] = t.keyMapper
             !(t.key inSet keep)
         }