From 6bf20ee474afa46564899e9f57065ad1f22fabed Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Thu, 8 Sep 2016 15:23:22 +1000 Subject: Compatibility with Scala 2.12.0-RC1 - method local lazy vals are now encoded as a single ValDef rather than a ValDef + DefDef pair. We need to treat ValDef-s with the LAZY flag in the same way as we used to treat the DefDef. - Rename one of the symbols `ANF,anf` in the same scope to avoid generating anonymous class names that differ only in case. The compiler warned about this one. - When patching the LabelDefs to have a `Unit` result type, propagate this other LabelDefs conclude with a jump to that label. Not sure why, but without this we now hit an error in the backend about the nonsensical attempt to emit a coercion from void to int. - Use crossScalaVersions in the build and update the Scala versions tested in CI. --- .travis.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 93bfda8..0943677 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,15 @@ env: script: - admin/build.sh scala: - - 2.11.4 + - 2.11.8 + - 2.12.0-RC1 jdk: - openjdk6 - - openjdk7 + - oraclejdk8 +matrix: + exclude: + - scala: 2.12.0-RC1 + jdk: openjdk6 notifications: email: - jason.zaugg@typesafe.com -- cgit v1.2.3