Scala 2.11 compatibility

We were relying on an internal API that no longer exists.

We also need to tweak the way our tests infer scalaBinaryVersion.

2 files changed, 17 insertions, 1 deletions

diff --git a/src/main/scala/scala/async/internal/AnfTransform.scala b/src/main/scala/scala/async/internal/AnfTransform.scala
index f7f691d..f19a87a 100644
--- a/src/main/scala/scala/async/internal/AnfTransform.scala
+++ b/src/main/scala/scala/async/internal/AnfTransform.scala
@@ -203,7 +203,21 @@ private[async] trait AnfTransform {
               }
             }
 
-            val typedNewApply = copyApplied(tree, treeInfo.dissectApplied(tree).applyDepth)
+
+            /** The depth of the nested applies: e.g. Apply(Apply(Apply(_, _), _), _)
+              *  has depth 3.  Continues through type applications (without counting them.)
+             */
+            def applyDepth: Int = {
+              def loop(tree: Tree): Int = tree match {
+                case Apply(fn, _)           => 1 + loop(fn)
+                case TypeApply(fn, _)       => loop(fn)
+                case AppliedTypeTree(fn, _) => loop(fn)
+                case _                      => 0
+              }
+              loop(tree)
+            }
+
+            val typedNewApply = copyApplied(tree, applyDepth)
 
             funStats ++ argStatss.flatten.flatten :+ typedNewApply
 
diff --git a/src/test/scala/scala/async/package.scala b/src/test/scala/scala/async/package.scala
index 7c42024..98d2256 100644
--- a/src/test/scala/scala/async/package.scala
+++ b/src/test/scala/scala/async/package.scala
@@ -43,8 +43,10 @@ package object async {
   }
 
   def scalaBinaryVersion: String = {
+    val PreReleasePattern = """.*-(M|RC).*""".r
     val Pattern = """(\d+\.\d+)\..*""".r
     scala.util.Properties.versionNumberString match {
+      case s @ PreReleasePattern(_) => s
       case Pattern(v) => v
       case _          => ""
     }