From 0aed9fca07ec733edb610e986904d75ec3d83c0f Mon Sep 17 00:00:00 2001 From: Cees de Groot Date: Tue, 6 Oct 2015 14:09:58 -0400 Subject: [PATCH] Move to 2.11 and cross compilation --- .travis.yml | 3 ++- project/Build.scala | 2 +- src/test/scala/com/evrl/unclever/BasicUsage.scala | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index dc37477..e6cf457 100644 --- 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 index f79c0d3..61006fa 100755 --- 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 index 67a1ded..0617464 100644 --- 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.