diff options
| author | Philipp Haller <hallerp@gmail.com> | 2014-07-15 17:57:54 +0200 |
|---|---|---|
| committer | Philipp Haller <hallerp@gmail.com> | 2014-07-15 17:57:54 +0200 |
| commit | 6fe79e9f363eae18d3f309738710c86a2292ce6e (patch) | |
| tree | ecc618fea091ed41c460dbd10717bf286b4d7080 | |
| parent | 443b50eabd1b41a89297f87266d2bb6d81dca715 (diff) | |
| parent | f2995e7062ff0a70eefb90d302ab94b42120485b (diff) | |
| download | scala-async-6fe79e9f363eae18d3f309738710c86a2292ce6e.tar.gz scala-async-6fe79e9f363eae18d3f309738710c86a2292ce6e.tar.bz2 scala-async-6fe79e9f363eae18d3f309738710c86a2292ce6e.zip | |
Merge pull request #81 from retronym/topic/bump-scala-version
Bump to a non-RC Scala version
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | build.sbt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 22666c2..9c83747 100644 --- 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 @@ -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")) |