Skip to content

Instantly share code, notes, and snippets.

@gkossakowski

gkossakowski/scala-xml_2.11.0-M6.patch

Created October 16, 2013 19:01
Show Gist options
  • Save gkossakowski/7012957 to your computer and use it in GitHub Desktop.
Save gkossakowski/7012957 to your computer and use it in GitHub Desktop.
Download ZIP
Patch applied to scala/scala-xml@dd1e0e4 for releasing against Scala 2.11.0-M6.
Raw
scala-xml_2.11.0-M6.patch
diff --git a/build.sbt b/build.sbt
index 8cd957a..50d4075 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,15 +2,15 @@ organization := "org.scala-lang.modules"
name := "scala-xml"
-version := "1.0.0-SNAPSHOT"
+version := "1.0.0-RC5"
// 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 := scalaVersion.value
// don't use for doc scope, scaladoc warnings are not to be reckoned with
@@ -42,6 +42,8 @@ publishTo := {
Some("releases" at nexus + "service/local/staging/deploy/maven2")
}
+credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
+
publishMavenStyle := true
publishArtifact in Test := false
@@ -88,9 +90,19 @@ TestKeys.partestVersion := "1.0.0-RC6"
// so that it can link to the compiler/lib we're using (testing)
// NOTE: not sure why, but the order matters (maybe due to the binary version conflicts for xml/parser combinators pulled in for scaladoc?)
libraryDependencies ++= (
- if (TestKeys.includeTestDependencies.value)
- Seq("org.scala-lang.modules" %% "scala-partest-interface" % "0.2" % "test",
- "org.scala-lang.modules" %% "scala-partest" % TestKeys.partestVersion.value % "test")
+ if (TestKeys.includeTestDependencies.value) {
+ def excludeScalaModules(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").
+ exclude("org.scala-lang.modules", "scala-parser-combinators_2.11.0-M5").
+ exclude("org.scala-lang.modules", "scala-parser-combinators_2.11.0-M4").
+ exclude("org.scala-lang", "scala-library").
+ exclude("org.scala-lang", "scala-compiler").
+ exclude("org.scala-lang", "scalap")
+ 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").
+ map(excludeScalaModules) :+ ("org.scala-lang" % "scala-compiler" % "2.11.0-M6")
+ }
else Seq.empty
)
diff --git a/test/files/neg/t1011.check b/test/files/neg/t1011.check
index d9c8123..3c9e4ec 100644
--- a/test/files/neg/t1011.check
+++ b/test/files/neg/t1011.check
@@ -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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment