diff --git a/.travis.yml b/.travis.yml index aece6d8..9fef43a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: scala script: - sbt ++$TRAVIS_SCALA_VERSION clean update compile scala: - - 2.11.0-SNAPSHOT + - 2.11.0 jdk: - openjdk6 - openjdk7 diff --git a/build.sbt b/build.sbt index 74f6988..121b616 100644 --- a/build.sbt +++ b/build.sbt @@ -4,16 +4,25 @@ scalaModuleSettings name := "scala-partest" -version := "1.0.0-SNAPSHOT" +version := "1.0.1-SNAPSHOT" -scalaVersion := "2.11.0-M8" +scalaVersion := "2.11.0" -scalaXmlVersion := "1.0.0-RC7" +scalaXmlVersion := "1.0.1" scalaCheckVersion := "1.11.3" -// used as binary version when compiling against 2.11.0-SNAPSHOT -snapshotScalaBinaryVersion := "2.11.0-M8" +// used as binary version when compiling against 2.12.0-SNAPSHOT +snapshotScalaBinaryVersion := "2.11.0" + +// TODO remove this after https://github.com/scala/sbt-scala-modules/pull/7 +// is merged and this build refers to the new plugin. +scalaBinaryVersion := ( + if (scalaVersion.value.startsWith("2.12")) + snapshotScalaBinaryVersion.value + else + scalaBinaryVersion.value +) // TODO: enable "-Xfatal-warnings" for nightlies, // off by default because we don't want to break scala/scala pr validation due to deprecation