aboutsummaryrefslogtreecommitdiff
path: root/build.sbt
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-09-08 15:23:22 +1000
committerJason Zaugg <jzaugg@gmail.com>2016-09-08 15:44:04 +1000
commit6bf20ee474afa46564899e9f57065ad1f22fabed (patch)
tree042f9a73f036191ae5b8178ebd3846b05eade760 /build.sbt
parent4395afe0ab7c59f088607d0849abe48b0f83265d (diff)
downloadscala-async-6bf20ee474afa46564899e9f57065ad1f22fabed.tar.gz
scala-async-6bf20ee474afa46564899e9f57065ad1f22fabed.tar.bz2
scala-async-6bf20ee474afa46564899e9f57065ad1f22fabed.zip
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.
Diffstat (limited to 'build.sbt')
-rw-r--r--build.sbt4
1 files changed, 3 insertions, 1 deletions
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"))