aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-10-18 21:49:54 +1100
committerGitHub <noreply@github.com>2016-10-18 21:49:54 +1100
commit9ee801309b145a40953d79dc0e8076d5440b5e35 (patch)
tree0a5a4071dcc2e8644fb66e62a06b152d582656f6
parent98d8f818f7996cd5ff16bd9c630f67fc1f343364 (diff)
parent1566dab0b8f905f4a86642bbbb17dd8bf81d2f6c (diff)
downloadscala-async-0.9.6-RC6.tar.gz
scala-async-0.9.6-RC6.tar.bz2
scala-async-0.9.6-RC6.zip
Merge pull request #162 from retronym/bump/RC2v0.9.6-RC6
Bump Scala version to 2.12.0-RC2
-rw-r--r--.travis.yml6
-rw-r--r--build.sbt2
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 4141cfb..40f8380 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ env:
# (See http://docs.travis-ci.com/user/environment-variables/#Secure-Variables.)
- secure: "YO/7YiWEirzz0EAy7oVNmAKroj4qCLZNMkPS+xW/VgeGjuEV+Nk1S7pwxF0o2OggSxIQ+a0lWSrOPQqSXMjOstDIzzGeYfuAt0+0fupXtDDge0mXpCCMadrvYzff1/5XYX0dJ+pjJmz6IgF1hliPJHIuddhhdqPxdHWTHAKm9ME="
-script:
+script:
- admin/build.sh
matrix:
include:
@@ -16,10 +16,10 @@ matrix:
env: IS_PUBLISH_JDK=true
- scala: 2.11.8
jdk: oraclejdk8
- - scala: 2.12.0-RC1
+ - scala: 2.12.0-RC2
jdk: oraclejdk8
env: IS_PUBLISH_JDK=true
notifications:
email:
- jason.zaugg@typesafe.com
- - philipp.haller@typesafe.com \ No newline at end of file
+ - philipp.haller@typesafe.com
diff --git a/build.sbt b/build.sbt
index a26fec7..74f6513 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,4 +1,4 @@
-crossScalaVersions := List("2.11.8", "2.12.0-RC1")
+crossScalaVersions := List("2.11.8", "2.12.0-RC2")
scalaVersion := crossScalaVersions.value.head