Merge pull request scala#81 from retronym/topic/bump-scala-version

phaller · phaller · commit 6fe79e9f363e · 2014-07-15T17:57:54.000+02:00
Bump to a non-RC Scala version
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: scala
 script: 
   - sbt ++$TRAVIS_SCALA_VERSION clean test publishLocal
 scala:
-  - 2.11.0-SNAPSHOT
+  - 2.11.1
 jdk:
   - openjdk6
   - openjdk7
diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.11.0-RC4"
+scalaVersion := "2.11.1"
 
 // Uncomment to test with a locally built copy of Scala.
 // scalaHome := Some(file("/code/scala2/build/pack"))

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-scalaVersion := "2.11.0-RC4"`
	`1`	`+scalaVersion := "2.11.1"`
`2`	`2`
`3`	`3`	`// Uncomment to test with a locally built copy of Scala.`
`4`	`4`	`// scalaHome := Some(file("/code/scala2/build/pack"))`