Merge pull request #16 from adriaanm/master

Build cleanup

Author: adriaanm

Diff for: .travis.yml

@@ -1,13 +1,14 @@
 language: scala
-script: 
-  - sbt ++$TRAVIS_SCALA_VERSION 'set concurrentRestrictions in Global += Tags.limit(Tags.Compile, 2)' compile test:compile
-  - sbt ++$TRAVIS_SCALA_VERSION 'set concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)' test
+script:
+  - sbt ++$TRAVIS_SCALA_VERSION clean update compile test
 scala:
-  - 2.10.3
   - 2.11.0-SNAPSHOT
 jdk:
   - oraclejdk6
   - openjdk7
 notifications:
   email:
-    - [email protected]
+    - [email protected]
+
+# if we get weird timeouts, see https://github.com/spray/spray/pull/233
+# 'set concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)'

Diff for: build.sbt

@@ -1,28 +1,33 @@
+import VersionKeys.{snapshotScalaBinaryVersion,deriveBinaryVersion}
+
 organization := "org.scala-lang.modules"
 
 name := "scala-xml"
 
 version := "1.0.0-SNAPSHOT"
 
-// standard stuff follows:
-scalaVersion := "2.11.0-M6"
+scalaVersion := "2.11.0-M7"
+
+snapshotScalaBinaryVersion := "2.11.0-M7"
 
-// NOTE: not necessarily equal to scalaVersion
-// (e.g., during PR validation, we override scalaVersion to validate,
-// but don't rebuild scalacheck, so we don't want to rewire that dependency)
-scalaBinaryVersion := "2.11.0-M6"
+// DOUBLETHINK YOUR WAY OUT OF EDITING BELOW (THERE IS NO BELOW)
+
+scalaBinaryVersion := deriveBinaryVersion(scalaVersion.value, snapshotScalaBinaryVersion.value)
 
 // to allow compiling against snapshot versions of Scala
 resolvers += Resolver.sonatypeRepo("snapshots")
 
-// don't use for doc scope, scaladoc warnings are not to be reckoned with
-scalacOptions in compile ++= Seq("-optimize", "-Xfatal-warnings", "-feature", "-deprecation", "-unchecked", "-Xlint")
 
 libraryDependencies ++= Seq(
   "org.scala-lang" % "scala-compiler" % scalaVersion.value % "test", // used in CompilerErrors test
   "junit" % "junit" % "4.11" % "test",
   "com.novocode" % "junit-interface" % "0.10" % "test")
 
+
+// don't use for doc scope, scaladoc warnings are not to be reckoned with
+// TODO: turn on for nightlies, but don't enable for PR validation... "-Xfatal-warnings"
+scalacOptions in compile ++= Seq("-optimize", "-feature", "-deprecation", "-unchecked", "-Xlint")
+
 // Generate $name.properties to store our version as well as the scala version used to build
 resourceGenerators in Compile <+= Def.task {
   val props = new java.util.Properties

Diff for: project/keys.scala

@@ -1,8 +1,11 @@
-object TestKeys {
+object VersionKeys {
   import sbt.settingKey
 
-  // for testing with partest
-  val includeTestDependencies = settingKey[Boolean]("Doesn't declare test dependencies.")
+  val snapshotScalaBinaryVersion = settingKey[String]("The Scala binary version to use when building against Scala SNAPSHOT.")
 
-  val partestVersion = settingKey[String]("Partest version.")
-}
+  def deriveBinaryVersion(sv: String, snapshotScalaBinaryVersion: String) = sv match {
+    case snap_211 if snap_211.startsWith("2.11") &&
+                     snap_211.contains("-SNAPSHOT") => snapshotScalaBinaryVersion
+    case sv => sbt.CrossVersion.binaryScalaVersion(sv)
+  }
+}