From 88cfa0a83e8929efdfa45051510be0b978a65915 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Tue, 6 May 2014 17:50:08 +0200 Subject: [PATCH 1/4] Use 2.11.0 for the travis build We'll need to add 2.12.0-SNAPSHOT once we have nightlies published from the 2.12.x branch. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 909b1e8ca969e39016ae52418efcf5491db3d155 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Fri, 2 May 2014 13:10:54 +0200 Subject: [PATCH 2/4] Bump versions after the 2.11.0 release. The release job does this dynamically, so this doesn't correct an error. Rather, it just brings things up to date in development mode. --- build.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 74f6988..bfa0c6f 100644 --- a/build.sbt +++ b/build.sbt @@ -6,14 +6,14 @@ name := "scala-partest" version := "1.0.0-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" +snapshotScalaBinaryVersion := "2.11.0" // TODO: enable "-Xfatal-warnings" for nightlies, // off by default because we don't want to break scala/scala pr validation due to deprecation From 9ca3fb1b11ac7e59a094c6de379b4182dce867fd Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Fri, 2 May 2014 13:14:46 +0200 Subject: [PATCH 3/4] Bump to 1.0.1-SNAPSHOT 1.0.0 is released already. --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index bfa0c6f..028e918 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ scalaModuleSettings name := "scala-partest" -version := "1.0.0-SNAPSHOT" +version := "1.0.1-SNAPSHOT" scalaVersion := "2.11.0" From cf781930fac99bc972c8c37276ce8b86ff54f20d Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Tue, 6 May 2014 17:48:08 +0200 Subject: [PATCH 4/4] Workaround for scalaBinaryVersion handling for 2.12.x This will be rolled into sbt-scala-modules soon, but I'd like to get the ball rolling here. --- build.sbt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 028e918..121b616 100644 --- a/build.sbt +++ b/build.sbt @@ -12,9 +12,18 @@ scalaXmlVersion := "1.0.1" scalaCheckVersion := "1.11.3" -// used as binary version when compiling against 2.11.0-SNAPSHOT +// 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 // don't use for doc scope, scaladoc warnings are not to be reckoned with