diff --git a/.travis.yml b/.travis.yml index dba8eda7..eb95c364 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ matrix: - jdk: oraclejdk7 scala: 2.11.8 - jdk: oraclejdk8 - scala: 2.12.0-RC1 + scala: 2.12.0 script: - sbt ++$TRAVIS_SCALA_VERSION test examples/test doc after_success: diff --git a/build.sbt b/build.sbt index 640f943c..200c4817 100644 --- a/build.sbt +++ b/build.sbt @@ -12,9 +12,9 @@ lazy val examples = project in file("examples") dependsOn (root % "test->test;co scalacOptions in ThisBuild := Seq("-feature", "-unchecked", "-deprecation", "-encoding", "utf8", "-Xfatal-warnings") -scalaVersion in ThisBuild := "2.11.8" +scalaVersion in ThisBuild := "2.12.0" -crossScalaVersions in ThisBuild := Seq("2.10.6", "2.11.8", "2.12.0-RC1") +crossScalaVersions in ThisBuild := Seq("2.10.6", "2.11.8", "2.12.0") parallelExecution in Test := false