Skip to content

Upgrade to Scala 2.11.0-M6. #6

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

Merged
merged 1 commit into from
Oct 25, 2013

Conversation

gkossakowski
Copy link
Contributor

That entails tweaking dependencies once again. Hold your breath:

  • we can't upgrade to new version of partest because it's not been
    released yet; we can't release it first because scalacheck is needed
  • therefore we are using the M5 version and then we have to exclude
    all transitive dependencies that were built against M5; one such
    dependency would be scala-compiler itself
  • since we excluded all transitive dependencies we need to bring some
    back: we add diffutils and scala-compiler but M6 version

All newly added dependencies are in "test" scope. I verified that nothing
leaks to a pom.xml.

That entails tweaking dependencies once again. Hold your breath:

  * we can't upgrade to new version of partest because it's not been
    released yet; we can't release it first because scalacheck is needed
  * therefore we are using the M5 version and then we have to exclude
    all transitive dependencies that were built against M5; one such
    dependency would be scala-compiler itself
  * since we excluded all transitive dependencies we need to bring some
    back: we add diffutils and scala-compiler but M6 version

All newly added dependencies are in "test" scope. I verified that nothing
leaks to a pom.xml.
@gkossakowski
Copy link
Contributor Author

Review by @adriaanm or @retronym.

This PR analogous to scala/scala-xml#10.

@gkossakowski
Copy link
Contributor Author

BTW. I only now noticed that parser-combinators has considerably less partest tests than xml. It'll be easier to migrate to JUnit (and remove dependency on partest) first.

@retronym
Copy link
Member

Do we actually need the new scalacheck version for our internal use as a partest dependency? Why not just make partest depend on scalacheck with an exclusion of parser-combinators?

@gkossakowski
Copy link
Contributor Author

I don't understand the question. I can't cut a new release of partest because it depends on scalacheck. Scalachecks depends on parser-combinators so we need to start with them in order to unbreak the cycle.

@retronym
Copy link
Member

Wasn't ScalaTest already released already for M6, albeit with one wrong dependency? Anyway, I like your idea to change to JUnit to save these questions.

@gkossakowski
Copy link
Contributor Author

Oh, I see what you mean (and I assume you wanted to say scalacheck). I'd like to not keep releasing anything against that broken (in terms of dependencies) release of scalacheck. I'd like to release xml and parser-combinators ASAP and unblock (proper) release of scalacheck, partest, scalatest, etc. I've been a little bit slow on fixing all those problems because I didn't feel I fully understand what's going on. Now I do.

In any case, migration to JUnit will indeed make all those questions irrelevant so consider this PR a transient step. I'll work on JUnit migration this week.

@adriaanm
Copy link
Contributor

LGTM -- yes, let's move to junit asap

gkossakowski added a commit that referenced this pull request Oct 25, 2013
@gkossakowski gkossakowski merged commit 48f9601 into scala:master Oct 25, 2013
@gkossakowski gkossakowski deleted the update-to-scala-M6 branch October 25, 2013 17:34
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.

3 participants