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. --- build.sbt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'build.sbt') diff --git a/build.sbt b/build.sbt index 9759fe9..a26fec7 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,6 @@ -scalaVersion := "2.11.6" +crossScalaVersions := List("2.11.8", "2.12.0-RC1") + +scalaVersion := crossScalaVersions.value.head // Uncomment to test with a locally built copy of Scala. // scalaHome := Some(file("/code/scala2/build/pack")) -- cgit v1.2.3