From f9940fc430085351ee27fde881631e4ff16593d3 Mon Sep 17 00:00:00 2001
From: Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com>
Date: Fri, 22 Feb 2013 16:50:56 -0800
Subject: [PATCH] Upgrade `source-depdencies/macro` test.

Switched to current version of Scala that sbt itself uses in
`source-dependencies/macro` test. Since sbt is on Scala 2.10 now
we can do that.

Adjusted test-case to current API for macros.
---
 .../source-dependencies/macro/macro-provider/Provider.scala  | 5 ++++-
 .../macro/macro-provider/changes/Provider.scala              | 5 ++++-
 .../sbt-test/source-dependencies/macro/project/build.scala   | 3 +--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/sbt/src/sbt-test/source-dependencies/macro/macro-provider/Provider.scala b/sbt/src/sbt-test/source-dependencies/macro/macro-provider/Provider.scala
index 93764e1b4..9b6d27676 100644
--- a/sbt/src/sbt-test/source-dependencies/macro/macro-provider/Provider.scala
+++ b/sbt/src/sbt-test/source-dependencies/macro/macro-provider/Provider.scala
@@ -1,5 +1,8 @@
 package macro
+import scala.language.experimental.macros
+import scala.reflect.macros._
 
 object Provider {
-	def macro tree(args: Any) = reify(args)
+	def tree(args: Any) = macro treeImpl
+	def treeImpl(c: Context)(args: c.Expr[Any]) = c.universe.reify(args.splice)
 }
diff --git a/sbt/src/sbt-test/source-dependencies/macro/macro-provider/changes/Provider.scala b/sbt/src/sbt-test/source-dependencies/macro/macro-provider/changes/Provider.scala
index 53a086bb8..711989b32 100644
--- a/sbt/src/sbt-test/source-dependencies/macro/macro-provider/changes/Provider.scala
+++ b/sbt/src/sbt-test/source-dependencies/macro/macro-provider/changes/Provider.scala
@@ -1,5 +1,8 @@
 package macro
+import scala.language.experimental.macros
+import scala.reflect.macros._
 
 object Provider {
-	def macro tree(args: Any) = sys.error("no macro for you!")
+	def tree(args: Any) = macro treeImpl
+	def treeImpl(c: Context)(args: c.Expr[Any]) = sys.error("no macro for you!")
 }
diff --git a/sbt/src/sbt-test/source-dependencies/macro/project/build.scala b/sbt/src/sbt-test/source-dependencies/macro/project/build.scala
index 1f95fbeb9..2ffd72654 100644
--- a/sbt/src/sbt-test/source-dependencies/macro/project/build.scala
+++ b/sbt/src/sbt-test/source-dependencies/macro/project/build.scala
@@ -3,8 +3,7 @@ import Keys._
 
 object build extends Build {
 	val defaultSettings = Seq(
-		scalaVersion := "2.10.0-M2",
-		scalacOptions += "-Xmacros"
+		libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-reflect" % _ )
 	)
 
 	lazy val root = Project(