aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-10-30 09:12:38 +1100
committerGitHub <noreply@github.com>2016-10-30 09:12:38 +1100
commitef70504bb9597c74ddf4b2cac729bc3d8929d81a (patch)
tree0e5f35ad451eced73e18519b45d8eb9741e69499
parent9ee801309b145a40953d79dc0e8076d5440b5e35 (diff)
parent782ca134605c36451f546b87c5777712a04e778a (diff)
downloadscala-async-0.9.6.tar.gz
scala-async-0.9.6.tar.bz2
scala-async-0.9.6.zip
Merge pull request #163 from retronym/bump/2.12.0v0.9.6
Bump to Scala 2.12.0
-rw-r--r--.travis.yml2
-rw-r--r--build.sbt2
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 40f8380..074c0fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ matrix:
env: IS_PUBLISH_JDK=true
- scala: 2.11.8
jdk: oraclejdk8
- - scala: 2.12.0-RC2
+ - scala: 2.12.0
jdk: oraclejdk8
env: IS_PUBLISH_JDK=true
notifications:
diff --git a/build.sbt b/build.sbt
index 74f6513..db99ccb 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,4 +1,4 @@
-crossScalaVersions := List("2.11.8", "2.12.0-RC2")
+crossScalaVersions := List("2.11.8", "2.12.0")
scalaVersion := crossScalaVersions.value.head