Merge pull request #30 from retronym/topic/unchecked-bounds

Use @uncheckedBounds to avoid introducing refchecks errors …

1 files changed, 21 insertions, 6 deletions

diff --git a/build.sbt b/build.sbt
index d6dc3bb..a013bb2 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,10 @@
-scalaVersion := "2.10.2"
+scalaVersion := "2.10.3-RC1"
 
 organization := "org.typesafe.async" // TODO new org name under scala-lang.
 
+// Uncomment to test with a locally built copy of Scala.
+// scalaHome := Some(file("/code/scala2/build/pack"))
+
 name := "scala-async"
 
 version := "1.0.0-SNAPSHOT"
@@ -15,7 +18,7 @@ libraryDependencies <++= (scalaVersion) {
 
 libraryDependencies += "junit" % "junit-dep" % "4.10" % "test"
 
-libraryDependencies += "com.novocode" % "junit-interface" % "0.10-M2" % "test"
+libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test"
 
 testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s")
 
@@ -23,10 +26,22 @@ parallelExecution in Global := false
 
 autoCompilerPlugins := true
 
-libraryDependencies <<= (scalaVersion, libraryDependencies) {
-  (ver, deps) =>
-    deps :+ compilerPlugin("org.scala-lang.plugins" % "continuations" % ver)
-}
+scalacOptions ++= (scalaHome.value match {
+  case Some(sh) =>
+    // Use continuations plugin from the local scala instance
+    val continuationsJar = sh / "misc" / "scala-devel" / "plugins" / "continuations.jar"
+    ("-Xplugin:" + continuationsJar.getAbsolutePath) :: Nil
+  case None =>
+    Nil
+})
+
+libraryDependencies ++= (scalaHome.value match {
+  case Some(sh) =>
+    Nil
+  case None =>
+    // Use continuations plugin from the published artifact.
+    compilerPlugin("org.scala-lang.plugins" % "continuations" % scalaVersion.value) :: Nil
+})
 
 scalacOptions += "-P:continuations:enable"