Skip to content

Upgrade to Scala 2.11.0-M6. #10

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 28, 2013
Merged

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.

Also, updated check file for one of the tests because there were some
improvements to error handling that changed errors being emitted. See
SI-7895 for details.

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.

Also, updated check file for one of the tests because there were some
improvements to error handling that changed errors being emitted. See
SI-7895 for details.
@gkossakowski
Copy link
Contributor Author

Review by @adriaanm or @retronym.

Once this patch is merged I'll go ahead and release a new version of scala-xml based on this commit. Having learnt my lesson, I won't be applying any non-trivial patches prior to cutting the release without a review.

@@ -108,11 +108,15 @@ libraryDependencies ++= (
*
*/
def excludeScalaXml(dep: ModuleID): ModuleID =
dep.exclude("org.scala-lang.modules", "scala-xml_2.11.0-M5").
exclude("org.scala-lang.modules", "scala-xml_2.11.0-M4").
dep.exclude("org.scala-lang.modules", "scala-xml_2.11.0-M4").
Copy link
Contributor

Choose a reason for hiding this comment

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

does this support wildcards? "scala-xml_.*"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think so but I would have to check. I'll remember to do that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In [sbt's documentation[(http://www.scala-sbt.org/release/docs/Detailed-Topics/Library-Management#exclude-transitive-dependencies) there's ExclusionRule mentioned briefly but there's no information anywhere whether it supports wildcards or not. Also, wildcards are not supported by Maven so I would rather not use them because they can't be incorporated in poms we generate.

@adriaanm
Copy link
Contributor

LGTM (modulo review comments)

I'm surprised partest works when its dependency is in the "test" config, but I'm assuming you verified that you can run test.

@gkossakowski
Copy link
Contributor Author

Yes, I did run partest and that's how I discovered I have to update the check file. :)

gkossakowski added a commit that referenced this pull request Oct 28, 2013
@gkossakowski gkossakowski merged commit 3a01e11 into scala:master Oct 28, 2013
@gkossakowski gkossakowski deleted the update-to-M6 branch October 28, 2013 11:57
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.

2 participants