Merge pull request #21 from gourlaysama/bump

gourlaysama · gourlaysama · commit 636bf3220b12 · 2014-06-27T10:00:11.000+02:00
bump versions: scala 2.11.1, sbt 0.13.5
diff --git a/.travis.yml b/.travis.yml
@@ -2,13 +2,14 @@ language: scala
 script:
   - sbt ++$TRAVIS_SCALA_VERSION clean update compile test
 scala:
-  - 2.11.0
+  - 2.11.1
 jdk:
   - openjdk6
   - openjdk7
 notifications:
   email:
     - adriaan.moors@typesafe.com
+    - antoine@gourlay.fr
 
 # if we get weird timeouts, see https://github.com/spray/spray/pull/233
 # 'set concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)'
diff --git a/build.sbt b/build.sbt
@@ -6,7 +6,7 @@ name                       := "scala-parser-combinators"
 
 version                    := "1.0.2-SNAPSHOT"
 
-scalaVersion               := "2.11.0"
+scalaVersion               := "2.11.1"
 
 snapshotScalaBinaryVersion := "2.11"
 
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.1
+sbt.version=0.13.5
