Skip to content

Add spire and discipline projects #24

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 5 commits into from
Mar 19, 2014
Merged

Add spire and discipline projects #24

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
abddfc5
Add typelevel/discipline project.
gkossakowski Mar 17, 2014
08c0b20
Add spire to the dbuild config.
gkossakowski Mar 17, 2014
d19db26
Merge remote-tracking branch 'typesafehub/master' into spire
gkossakowski Mar 19, 2014
83193c7
Remove work-around from spire build definition.
gkossakowski Mar 19, 2014
4828fc7
Remove unnecessary emphasis from comments.
gkossakowski Mar 19, 2014
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: 16 additions & 1 deletion common-2.11.x.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ vars: {
playframework-ref : "playframework/playframework.git#3b63ece20430f202363dc025a36fd00ed5d0283f"
// fixed sha from master that has Scala 2.11 patches merged
parboiled-ref : "sirthias/parboiled.git#c53e650212f222c9b1f75fa1ab13d7cab9db164e"
// fixed sha/tag (a compromise), the sha points at master that does support Scala 2.11
// fixed sha/tag (a compromise), the sha points at master that supports Scala 2.11
// but haven't diverged from 1.3 release yet
scala-arm-ref : "jsuereth/scala-arm.git#9c5e817a88de804c82a6b2f1447ef6fed9a46a57"
// fixed sha/tag (a compromise)
Expand All @@ -77,6 +77,8 @@ vars: {
// https://github.com/valotrading/zeromq-scala-binding/commit/c2a8a87673a1a3468486d1af9a6460bfed25c7a2
// therefore (which has a broken libdep of scalatest, however (cross full)):
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"

// tracking upstream (the ideal)
akka-ref : "akka/akka.git"
Expand All @@ -95,6 +97,7 @@ vars: {
sbt-ref : "sbt/sbt.git#0.13"
scalaz-ref : "scalaz/scalaz.git#series/7.0.x"
shapeless-ref : "milessabin/shapeless.git#scala-2.11.x"
discipline-ref : "typelevel/discipline.git#v0.2"

// version settings
sbt-version-override : "0.13.1"
Expand Down Expand Up @@ -277,6 +280,18 @@ build += {
}
}

${vars.base} {
name: "discipline"
uri: "https://github.com/"${vars.discipline-ref}
extra.sbt-version: ${vars.sbt-version-override}
}

${vars.base} {
name: "spire"
uri: "https://github.com/"${vars.spire-ref}
extra.sbt-version: ${vars.sbt-version-override}
}

${vars.base} {
name: "genjavadoc-plugin",
uri: "https://github.com/"${vars.genjavadoc-ref}
Expand Down