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

update to spray 1.3.2 #68

Merged
merged 1 commit into from
Oct 24, 2014
Merged

Conversation

jrudolph
Copy link
Member

This disables legacy subprojects depending on shapeless 1.

@jrudolph
Copy link
Member Author

May fix first part of #67

@jrudolph
Copy link
Member Author

Can you trigger a build for this one?

@jrudolph
Copy link
Member Author

If it works we can try running the tests as well.

@gkossakowski
Copy link
Member

@jrudolph
Copy link
Member Author

This failed but it showed a few interesting things:

  • we don't have a spray-testkit-shapeless2 project but spray-testkit just seems to work both for the shapeless1 and shapeless2 versions because it doesn't seem to touch any shapeless related code of spray-routing and the dependency is declared as "provided"
  • docs and examples are still built using the shapeless1 version that's why this build ultimately failed

I made a small update to the spray build and updated this PR to use the new version. Could you trigger another build with this version?

@gkossakowski
Copy link
Member

Running here: https://jenkins-dbuild.typesafe.com:8499/job/Community-2.11.x-manual/76/console

I found this comment related to shapeless in the config:

  // latest commits in scala-2.11.x branch break spray, Miles has been pinged about it
  // TODO: add shapeless 1.2.4 to dbuild definition which should allow us to switch to
  // upstream version of spray that depends on shapeless 1.2.4
  shapeless-ref                : "milessabin/shapeless.git#6dd9ec22b68d6a911ad83d0a537bf2043b748fc2"

I'm wondering if this might cause problems for you trying to upgrade to stable version of spray?

@@ -59,7 +59,8 @@ vars: {
// TODO: merge required changes upstream to get rid of our forks, maintaining our one won't scale
browse-ref : "retronym/browse.git#topic/2.11-compat"
lift-framework-ref : "lift/framework.git#3.0-M2-release"
spray-ref : "gkossakowski/spray.git#1.3-scala-2.11"
// basically spray 1.3.2 with some build fixes applied
spray-ref : "spray/spray.git#43d93b255c6a7f9e510111e9272d83e228638304"
Copy link
Member

Choose a reason for hiding this comment

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

Are those build fixes be included in future versions of spray so we can stick to a tag?

@gkossakowski
Copy link
Member

Given that this builds successfully I'm going to merge it because it's net improvement. We can look into shapeless situation as a second step.

gkossakowski added a commit that referenced this pull request Oct 24, 2014
@gkossakowski gkossakowski merged commit 524c70c into scala:master Oct 24, 2014
@gkossakowski
Copy link
Member

Thanks for contribution!

@jrudolph
Copy link
Member Author

I found this comment related to shapeless in the config

Yes, right, I read this but forgot about it later on. I think this is just an old comment and we should try to update to a proper tag of shapeless.

Are those build fixes be included in future versions of spray so we can stick to a tag?

Yes, exactly, it's current HEAD of the regular release/1.3 branch just two or three commits after the v1.3.2 release tag where I fixed the small things we noticed here.

@jrudolph jrudolph deleted the update-to-spray-1.3.2 branch October 25, 2014 09:07
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