Move to 2.11 and cross compilation

cdegroot · Oct 6, 2015 · 0aed9fc · 0aed9fc
1 parent 296e86f
commit 0aed9fc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,4 @@
 language: scala
 scala:
-    - 2.10.5
+    - 2.10.6
+    - 2.11.7
diff --git a/project/Build.scala b/project/Build.scala
@@ -6,7 +6,7 @@ object UncleverBuild extends Build {
   lazy val root = Project(id = "unclever", base = file("."))
     .configs(IntegrationTest)
     .settings(
-      scalaVersion := "2.10.5",
+      scalaVersion := "2.11.7",
       crossScalaVersions := Seq("2.10.5", "2.11.7"),
       scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature", "-Xfatal-warnings"),
       libraryDependencies ++= Seq(

diff --git a/src/test/scala/com/evrl/unclever/BasicUsage.scala b/src/test/scala/com/evrl/unclever/BasicUsage.scala
@@ -8,6 +8,9 @@ import org.scalatest.{FlatSpec, ShouldMatchers}
 
 import scala.util.{Failure, Success, Try}
 
+import com.evrl.unclever._
+
+
 /**
  * The tests in this class are all ignored by design. They serve as compilable documentation
  * on how to use the library. Compiler-driven design: if you want to extend the library,
@@ -72,7 +75,6 @@ class BasicUsage extends FlatSpec with ShouldMatchers with MockFactory {
 
   it should "nicely combine multiple SQL statements" ignore {
     //    sql"create table incident_numbers(account_id int autoincrement, incident_number int)"
-    import com.evrl.unclever._
 
     // A simple numerator. Could be in one SQL statement, but this demonstrates how to implement
     // the pattern "get some data, munch it, update it" in a for comprehension.