Cross-building for 2.11 and 2.12

Changes the travis script to run +test and +publish-signed (if
the commit is tagged).

Author: lrytz

.travis.yml

@@ -7,11 +7,8 @@ env:
 # this environment variable is encrypted with this repo's private key and stored below:
 # (See http://docs.travis-ci.com/user/environment-variables/#Secure-Variables.)
     - secure: "whJQqI/7G+kUJoCCGQYbv3Y/T2Cx3EcBKfCyvMkZaVgo0wFEOUguh8I+4QqRyf9cC/uPmzwCzV9uwXsNDMcY78jouY05A+fCEnUol/9TuF5PWmXF6Yr/UmmYoCQe4pioXsbXa4uOy18kLzE0h2sOIrJ5A9NL8/58iVgl4E3pwvk="
-
 script:
   - admin/build.sh
-scala:
-  - 2.11.4
 jdk:
   - openjdk6
   - openjdk7

admin/build.sh

@@ -9,11 +9,11 @@ if [ "$TRAVIS_JDK_VERSION" == "$PUBLISH_JDK" ] && [[ "$TRAVIS_TAG" =~ ^v[0-9]+\.
   echo "Going to release from tag $TRAVIS_TAG!"
   myVer=$(echo $TRAVIS_TAG | sed -e s/^v//)
   publishVersion='set every version := "'$myVer'"'
-  extraTarget="publish-signed"
+  extraTarget="+publish-signed"
 
   cat admin/gpg.sbt >> project/plugins.sbt
   admin/decrypt.sh sensitive.sbt
   (cd admin/ && ./decrypt.sh secring.asc)
 fi
 
-sbt ++$TRAVIS_SCALA_VERSION "$publishVersion" clean update compile test $extraTarget
+sbt "$publishVersion" clean update +test $extraTarget

build.sbt

@@ -6,7 +6,9 @@ name                       := "scala-xml"
 
 version                    := "1.0.5-SNAPSHOT"
 
-scalaVersion               := "2.11.4"
+scalaVersion               := crossScalaVersions.value.head
+
+crossScalaVersions         := Seq("2.11.6", "2.12.0-M1")
 
 // important!! must come here (why?)
 scalaModuleOsgiSettings