From b77716499310a016e596792841db64843eb96ed1 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Mon, 26 Sep 2016 16:08:37 -0700
Subject: [PATCH] unfork macro paradise

a little bit of poetry, that. "unfork macro paradise".

since the fork happened, it looks like Eugene B took care of making
the needed changes upstream.

fixes #302
---
 common.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/common.conf b/common.conf
index 24964eab1..9c7a23bc1 100644
--- a/common.conf
+++ b/common.conf
@@ -78,7 +78,7 @@ vars: {
   utest-ref                    : "lihaoyi/utest.git#0.4.3"
   acyclic-ref                  : "lihaoyi/acyclic.git"
   sourcecode-ref               : "lihaoyi/sourcecode.git"
-  macro-paradise-ref           : "adriaanm/paradise.git#2.12.x-cobu"
+  macro-paradise-ref           : "scalamacros/paradise.git#2.12.0-RC1"  // TODO use 2.12.x branch once needed changes are merged there?
   macro-compat-ref             : "milessabin/macro-compat.git"
   scala-logging-ref            : "typesafehub/scala-logging.git"
   scalaprops-ref               : "scalaprops/scalaprops.git#0.1.x"  // master uses FreeT from scalaz 7.2, we're on 7.1
@@ -472,7 +472,6 @@ build += {
   ${vars.base} {
     name:   "macro-paradise"
     uri:    "http://github.com/"${vars.macro-paradise-ref}
-    extra.run-tests: false // see https://github.com/scala/scala-dev/issues/203
   }
 
   ${vars.base} {