Release/0.9.0 m1

release.sh

@@ -0,0 +1,35 @@
+#! /bin/bash -e
+#
+# Build, test, and release Scala Async.
+#
+# Requires credentials:
+#
+#   % cat ~/.sbt/0.13/publish.sbt
+#   credentials += Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", "<user>", "<pass>")
+
+function sbt211() {
+  sbt 'set scalaVersion := "2.11.0-M6"' 'set scalaBinaryVersion := scalaVersion.value' $@
+  return $?
+}
+die () {
+  echo "$@"
+  exit 1
+}
+
+CHECK=";clean;test;publishLocal"
+RELEASE=";clean;test;publish"
+VERSION=`gsed -rn 's/version :=.*"(.+).*"/\1/p' build.sbt`
+[[ -n "$(git status --porcelain)" ]] && die "working directory is not clean!"
+
+sbt211 $CHECK
+sbt $CHECK
+sbt $RELEASE
+sbt211 $RELEASE
+
+cat <<EOM
+Released! For non-snapshot releases:
+ - tag: git tag -s -a v$VERSION -m "scala-async $VERSION"
+ - push tag: git push origin v$VERSION
+ - close the staging repository: https://oss.sonatype.org
+ - change the version number in build.sbt to a suitable -SNAPSHOT version
+EOM

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
 

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 _          => ""
     }