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.

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 1 commit into from
Oct 28, 2013
Merged

Upgrade to Scala 2.11.0-M6. #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ name := "scala-xml"
version := "1.0.0-SNAPSHOT"

// standard stuff follows:
scalaVersion := "2.11.0-M5"
scalaVersion := "2.11.0-M6"

// NOTE: not necessarily equal to scalaVersion
// (e.g., during PR validation, we override scalaVersion to validate,
// but don't rebuild scalacheck, so we don't want to rewire that dependency)
scalaBinaryVersion := "2.11.0-M5"
scalaBinaryVersion := "2.11.0-M6"


// don't use for doc scope, scaladoc warnings are not to be reckoned with
Expand Down Expand Up @@ -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.

exclude("org.scala-lang.modules", "scala-xml_2.11.0-M5").
exclude("org.scala-lang.modules", "scala-xml_2.11.0-M6").
exclude("org.scalacheck", "scalacheck_2.11.0-M5")
Seq("org.scala-lang.modules" % "scala-partest-interface_2.11.0-M5" % "0.2" % "test",
"org.scala-lang.modules" % "scala-partest_2.11.0-M5" % TestKeys.partestVersion.value % "test").
Seq("org.scala-lang.modules" % "scala-partest-interface_2.11.0-M5" % "0.2" % "test" intransitive,
"org.scala-lang.modules" % "scala-partest_2.11.0-M5" % TestKeys.partestVersion.value % "test" intransitive,
// diffutils is needed by partest
"com.googlecode.java-diff-utils" % "diffutils" % "1.3.0" % "test",
Copy link
Contributor

Choose a reason for hiding this comment

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

why no intransitive here? and the next line?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Well, diffutils doesn't have any Scala dependencies so transitive dependencies of diffutils are harmless (there are none, actually).

Scala compiler needs transitive dependencies like scala-reflect to work. Maybe I should mark scala-compiler intransitive and add those explicitly again. I don't know.

"org.scala-lang" % "scala-compiler" % scalaVersion.value % "test").
map(excludeScalaXml)
}
else Seq.empty
Expand Down
206 changes: 205 additions & 1 deletion test/files/neg/t1011.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,208 @@
t1011.scala:8: error: not found: value entity
<dl><code>{Text(entity)}</code>
^
one error found
t1011.scala:9: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:10: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:11: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:12: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:13: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:14: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:15: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:16: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:17: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:18: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:19: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:20: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:21: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:22: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:23: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:24: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:25: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:26: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:27: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:28: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:29: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:30: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:31: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:32: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:33: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:34: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:35: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:36: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:37: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:38: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:39: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:40: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:41: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:42: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:43: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:44: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:45: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:46: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:47: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:48: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:49: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:50: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:51: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:52: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:53: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:54: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:55: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:56: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:57: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:58: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:59: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:60: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:61: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:62: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:63: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:64: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:65: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:66: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:67: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:68: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:69: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:70: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:71: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:72: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:73: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:74: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:75: error: not found: value entity
<code>{Text(entity)}</code>
^
t1011.scala:76: error: not found: value entity
<code>{Text(entity)}</code></dl>
^
69 errors found