aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-09-08 16:05:45 +1000
committerGitHub <noreply@github.com>2016-09-08 16:05:45 +1000
commit567ca8b1ca24c497c3a75e1d17609cca9d636a62 (patch)
tree0cb31396e673e880157cd154ca67e7afc65937a5 /.travis.yml
parentea6afc0266c10b693ad0daa1643a2ee5c834e076 (diff)
parentc15c45292b1cb858b32e3967d53126c9cc36f41b (diff)
downloadscala-async-567ca8b1ca24c497c3a75e1d17609cca9d636a62.tar.gz
scala-async-567ca8b1ca24c497c3a75e1d17609cca9d636a62.tar.bz2
scala-async-567ca8b1ca24c497c3a75e1d17609cca9d636a62.zip
Merge pull request #160 from retronym/topic/2.12
Compatibility with Scala 2.12.0-RC1
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml10
1 files changed, 8 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 93bfda8..df51411 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,10 +11,16 @@ env:
script:
- admin/build.sh
scala:
- - 2.11.4
+ - 2.11.8
+ - 2.12.0-RC1 # !!! Duplicated below, edit with care
jdk:
- openjdk6
- - openjdk7
+ - oraclejdk8
+matrix:
+ exclude:
+
+ - scala: 2.12.0-RC1 # !!! Duplicated above, edit with care
+ jdk: openjdk6
notifications:
email:
- jason.zaugg@typesafe.com