diff --git a/.travis.yml b/.travis.yml index 639444bb0..895984e79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,6 @@ language: scala + scala: 2.11.8 + +script: + - sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M "so test" diff --git a/build.sbt b/build.sbt index 7cfafd386..c08b7a214 100644 --- a/build.sbt +++ b/build.sbt @@ -15,6 +15,8 @@ def commonSettings: Seq[Setting[_]] = Seq( javacOptions in compile ++= Seq("-target", "6", "-source", "6", "-Xlint", "-Xlint:-serial"), crossScalaVersions := Seq(scala211), scalacOptions ++= Seq("-Ywarn-unused", "-Ywarn-unused-import"), + scalacOptions --= // scalac 2.10 rejects some HK types under -Xfuture it seems.. + (CrossVersion partialVersion scalaVersion.value collect { case (2, 10) => List("-Xfuture", "-Ywarn-unused", "-Ywarn-unused-import") }).toList.flatten, previousArtifact := None, // Some(organization.value %% moduleName.value % "1.0.0"), publishArtifact in Compile := true, publishArtifact in Test := false @@ -92,6 +94,7 @@ lazy val utilLogging = (project in internalPath / "util-logging"). dependsOn(utilInterface, utilTesting % Test). settings( commonSettings, + crossScalaVersions := Seq(scala210, scala211), name := "Util Logging", libraryDependencies += jline ) @@ -137,6 +140,7 @@ lazy val utilTracking = (project in internalPath / "util-tracking"). lazy val utilTesting = (project in internalPath / "util-testing"). settings( commonSettings, + crossScalaVersions := Seq(scala210, scala211), name := "Util Testing", libraryDependencies ++= Seq(scalaCheck, scalatest) ) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ff5159413..8e9f07b08 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -2,6 +2,7 @@ import sbt._ import Keys._ object Dependencies { + lazy val scala210 = "2.10.6" lazy val scala211 = "2.11.8" lazy val scala212 = "2.12.0-M4"