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} {