aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-02-21 11:44:40 +0100
committerJason Zaugg <jzaugg@gmail.com>2014-02-21 11:49:23 +0100
commit61a682f26e4ecf3734a1b457824756d7fd110e06 (patch)
treee0fa81dad28b7e39e4077dd1e39fda92d2fca358 /src
parentbc51a19ab4c7fccfa64554dce5098481aec8cdac (diff)
downloadscala-async-61a682f26e4ecf3734a1b457824756d7fd110e06.tar.gz
scala-async-61a682f26e4ecf3734a1b457824756d7fd110e06.tar.bz2
scala-async-61a682f26e4ecf3734a1b457824756d7fd110e06.zip
Finalize the move to Scala 2.11.x
- Link to the 2.10.x branch from the README - use `scala.annotation.compileTimeOnly` (from scala-library.jar) - no longer impose a transitive dependency on scala-reflect and scala-compiler. - Update Travis CI configuration to use only 2.11.0-SNAPSHOT
Diffstat (limited to 'src')
-rw-r--r--src/main/scala/scala/async/Async.scala2
1 files changed, 1 insertions, 1 deletions
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]].