Skip to content

Commit 87357a2

Browse files
committed
Merge pull request #206 from SethTisue/macro-paradise
add macro paradise and macro-compat
2 parents d51edcf + a4031cb commit 87357a2

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

common.conf

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ vars: {
7474
zeromq-scala-binding-ref : "valotrading/zeromq-scala-binding.git#062e9438e322ec29d75b9649cb2aafa6ba3198a6"
7575
// fixed sha/tag (a compromise), the sha points at master that supports Scala 2.11
7676
spire-ref : "non/spire.git#3d2a41e91a1f6946fac63660f6157d4a6e4a281d"
77-
// https://github.com/scala/community-builds/issues/202
78-
shapeless-ref : "milessabin/shapeless.git#d6a4f56e0783655c48244ec23c4f4c2d98401a72"
77+
shapeless-ref : "milessabin/shapeless.git"
7978
scoverage-ref : "scoverage/scalac-scoverage-plugin.git#1.0.2"
8079
// change from https://github.com/sbt/sbt/pull/1509 broke building sbt with Scala 2.11
8180
// this problem is tracked in https://github.com/sbt/sbt/issues/1523
@@ -96,6 +95,8 @@ vars: {
9695
scala-xml-ref : "scala/scala-xml.git"
9796
scala-swing-ref : "scala/scala-swing.git#1.0.x"
9897
scala-records-ref : "scala-records/scala-records.git"
98+
macro-paradise-ref : "scalamacros/paradise.git#2.11.x"
99+
macro-compat-ref : "milessabin/macro-compat.git"
99100

100101
// TODO move back to master after adding scalaz-stream to the community build.
101102
// the fork was necessary because Specs 2.4 uses Shapeless 2.0.0 but we want
@@ -561,5 +562,17 @@ build += {
561562
extra.projects: ["utestJVM"]
562563
}
563564

565+
${vars.base} {
566+
name: "macro-paradise",
567+
uri: "http://github.com/"${vars.macro-paradise-ref}
568+
}
569+
570+
${vars.base} {
571+
name: "macro-compat",
572+
uri: "http://github.com/"${vars.macro-compat-ref}
573+
// no Scala.js plz
574+
extra.projects: ["testJVM"]
575+
}
576+
564577
]
565578
}

0 commit comments

Comments
 (0)