Skip to content
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.

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

Add spire and discipline projects #24

Merged
merged 5 commits into from Mar 19, 2014
Merged

Conversation

gkossakowski
Copy link
Member

Discipline is a dependency of spire so it joined the family too :-)

It's a dependency of spire so we would like to give it a warm welcome in
dbuild-covered family of projects!
It almost builds completely with Scala 2.11. The one subproject that
crashes the compiler is "tests". It fails due to
https://issues.scala-lang.org/browse/SI-8425.
@gkossakowski
Copy link
Member Author

Review by @retronym

uri: "https://github.com/"${vars.spire-ref}
extra: {
// all except "tests" subproject that crashes due to https://issues.scala-lang.org/browse/SI-8425
projects: ["core", "benchmark", "examples", "macros", "scalacheck-binding"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fix is merged, lets build it all now.

@@ -80,6 +80,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 does support Scala 2.11
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just FYI: "that supports" would be idiomatic English here, unless you are really emphasising the "does" part ("Unlike X, Y really does support Z")

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. :-)
Yes, I'm aware of implied emphasis brought by "does". I put it in original comment the first time I used fixed sha to emphasize the fact it's sha taken after compatibility patches were merged upstream. However, as this becoming a default situation now it doesn't need emphasis anymore but it's carried over by Mr Copy Paste.

I'll clean it up.

The bug that was causing Scala compiler crash in spire's tests has been
fixed upstream. We can build entire spire now.
Support for Scala 2.11 is becoming a default now. No need to emphasize that
anymore.
@gkossakowski
Copy link
Member Author

@retronym: feedback addressed

I tested these changes locally. The build passes.

retronym added a commit that referenced this pull request Mar 19, 2014
Add spire and discipline projects
@retronym retronym merged commit 6abf837 into scala:master Mar 19, 2014
@retronym
Copy link
Member

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants