Skip to content

add macro paradise and macro-compat #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 19, 2016
Merged

add macro paradise and macro-compat #206

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f64852b
add macro paradise and macro-compat
SethTisue Jan 14, 2016
f7dc354
Merge remote-tracking branch 'origin/2.11.x' into macro-paradise
SethTisue Jan 19, 2016
a4031cb
Revert "freeze Shapeless for now"
SethTisue Jan 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions common.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ vars: {
zeromq-scala-binding-ref : "valotrading/zeromq-scala-binding.git#062e9438e322ec29d75b9649cb2aafa6ba3198a6"
// fixed sha/tag (a compromise), the sha points at master that supports Scala 2.11
spire-ref : "non/spire.git#3d2a41e91a1f6946fac63660f6157d4a6e4a281d"
// https://github.com/scala/community-builds/issues/202
shapeless-ref : "milessabin/shapeless.git#d6a4f56e0783655c48244ec23c4f4c2d98401a72"
shapeless-ref : "milessabin/shapeless.git"
scoverage-ref : "scoverage/scalac-scoverage-plugin.git#1.0.2"
// change from https://github.com/sbt/sbt/pull/1509 broke building sbt with Scala 2.11
// this problem is tracked in https://github.com/sbt/sbt/issues/1523
Expand All @@ -96,6 +95,8 @@ vars: {
scala-xml-ref : "scala/scala-xml.git"
scala-swing-ref : "scala/scala-swing.git#1.0.x"
scala-records-ref : "scala-records/scala-records.git"
macro-paradise-ref : "scalamacros/paradise.git#2.11.x"
macro-compat-ref : "milessabin/macro-compat.git"

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

${vars.base} {
name: "macro-paradise",
uri: "http://github.com/"${vars.macro-paradise-ref}
}

${vars.base} {
name: "macro-compat",
uri: "http://github.com/"${vars.macro-compat-ref}
// no Scala.js plz
extra.projects: ["testJVM"]
}

]
}