4 files changed, 8 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml
index 7fb860d..22666c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,7 @@ language: scala
 script: 
   - sbt ++$TRAVIS_SCALA_VERSION clean test publishLocal
 scala:
-  - 2.10.3
-  - 2.11.0-M6
+  - 2.11.0-SNAPSHOT
 jdk:
   - openjdk6
   - openjdk7
diff --git a/README.md b/README.md
index f2aa888..d30380f 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 [![Build Status](https://secure.travis-ci.org/scala/async.png)](http://travis-ci.org/scala/async)
 
+Note: this branch targets Scala 2.11.x, support for Scala 2.10.x has been moved to [this branch](https://github.com/scala/async/tree/2.10.x).
 
 ## Quick start
 
diff --git a/build.sbt b/build.sbt
index da8f3aa..66a6f00 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,8 +1,8 @@
-scalaVersion := "2.11.0-RC1"
+scalaVersion := "2.11.0-SNAPSHOT"
 
 // Uncomment to test with a locally built copy of Scala.
 // scalaHome := Some(file("/code/scala2/build/pack"))
-
+resolvers ++= (if (scalaVersion.value.endsWith("SNAPSHOT")) List(Resolver.sonatypeRepo("snapshots")) else Nil)
 
 organization := "org.scala-lang.modules"
 
@@ -10,15 +10,9 @@ name := "scala-async"
 
 version := "0.9.0-SNAPSHOT"
 
-libraryDependencies <++= (scalaVersion) {
-  sv => Seq(
-    // TODO we should make this provided after we rely on @compileTimeOnly in scla-library in 2.11.-
-    //      but if we do that now, and a user doesn't have this on the classpath, they can get the
-    //      dreaded MissingRequirementErrors when unpickling types from scala.async.Async
-    "org.scala-lang" % "scala-reflect" % sv,
-    "org.scala-lang" % "scala-compiler" % sv % "provided"
-  )
-}
+libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided"
+
+libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % "test" // for ToolBox
 
 libraryDependencies += "junit" % "junit-dep" % "4.10" % "test"
 
diff --git a/src/main/scala/scala/async/Async.scala b/src/main/scala/scala/async/Async.scala
index 17a63a4..bacf70a 100644
--- a/src/main/scala/scala/async/Async.scala
+++ b/src/main/scala/scala/async/Async.scala
@@ -6,7 +6,7 @@ package scala.async
 
 import scala.language.experimental.macros
 import scala.concurrent.{Future, ExecutionContext}
-import scala.reflect.internal.annotations.compileTimeOnly
+import scala.annotation.compileTimeOnly
 
 /**
  * Async blocks provide a direct means to work with [[scala.concurrent.Future]].