Skip to content

Commit 3a01e11

Browse files
gkossakowskigkossakowski
committed
Merge pull request #10 from gkossakowski/update-to-M6
Upgrade to Scala 2.11.0-M6.
2 parents dc7897f + cc1f8be commit 3a01e11

File tree

2 files changed

+215
-7
lines changed

2 files changed

+215
-7
lines changed

‎build.sbt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ name := "scala-xml"
55
version := "1.0.0-SNAPSHOT"
66

77
// standard stuff follows:
8-
scalaVersion := "2.11.0-M5"
8+
scalaVersion := "2.11.0-M6"
99

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

1515

1616
// don't use for doc scope, scaladoc warnings are not to be reckoned with
@@ -108,11 +108,15 @@ libraryDependencies ++= (
108108
*
109109
*/
110110
def excludeScalaXml(dep: ModuleID): ModuleID =
111-
dep.exclude("org.scala-lang.modules", "scala-xml_2.11.0-M5").
112-
exclude("org.scala-lang.modules", "scala-xml_2.11.0-M4").
111+
dep.exclude("org.scala-lang.modules", "scala-xml_2.11.0-M4").
112+
exclude("org.scala-lang.modules", "scala-xml_2.11.0-M5").
113+
exclude("org.scala-lang.modules", "scala-xml_2.11.0-M6").
113114
exclude("org.scalacheck", "scalacheck_2.11.0-M5")
114-
Seq("org.scala-lang.modules" % "scala-partest-interface_2.11.0-M5" % "0.2" % "test",
115-
"org.scala-lang.modules" % "scala-partest_2.11.0-M5" % TestKeys.partestVersion.value % "test").
115+
Seq("org.scala-lang.modules" % "scala-partest-interface_2.11.0-M5" % "0.2" % "test" intransitive,
116+
"org.scala-lang.modules" % "scala-partest_2.11.0-M5" % TestKeys.partestVersion.value % "test" intransitive,
117+
// diffutils is needed by partest
118+
"com.googlecode.java-diff-utils" % "diffutils" % "1.3.0" % "test",
119+
"org.scala-lang" % "scala-compiler" % scalaVersion.value % "test").
116120
map(excludeScalaXml)
117121
}
118122
else Seq.empty

‎test/files/neg/t1011.check

Lines changed: 205 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,208 @@
11
t1011.scala:8: error: not found: value entity
22
<dl><code>{Text(entity)}</code>
33
^
4-
one error found
4+
t1011.scala:9: error: not found: value entity
5+
<code>{Text(entity)}</code>
6+
^
7+
t1011.scala:10: error: not found: value entity
8+
<code>{Text(entity)}</code>
9+
^
10+
t1011.scala:11: error: not found: value entity
11+
<code>{Text(entity)}</code>
12+
^
13+
t1011.scala:12: error: not found: value entity
14+
<code>{Text(entity)}</code>
15+
^
16+
t1011.scala:13: error: not found: value entity
17+
<code>{Text(entity)}</code>
18+
^
19+
t1011.scala:14: error: not found: value entity
20+
<code>{Text(entity)}</code>
21+
^
22+
t1011.scala:15: error: not found: value entity
23+
<code>{Text(entity)}</code>
24+
^
25+
t1011.scala:16: error: not found: value entity
26+
<code>{Text(entity)}</code>
27+
^
28+
t1011.scala:17: error: not found: value entity
29+
<code>{Text(entity)}</code>
30+
^
31+
t1011.scala:18: error: not found: value entity
32+
<code>{Text(entity)}</code>
33+
^
34+
t1011.scala:19: error: not found: value entity
35+
<code>{Text(entity)}</code>
36+
^
37+
t1011.scala:20: error: not found: value entity
38+
<code>{Text(entity)}</code>
39+
^
40+
t1011.scala:21: error: not found: value entity
41+
<code>{Text(entity)}</code>
42+
^
43+
t1011.scala:22: error: not found: value entity
44+
<code>{Text(entity)}</code>
45+
^
46+
t1011.scala:23: error: not found: value entity
47+
<code>{Text(entity)}</code>
48+
^
49+
t1011.scala:24: error: not found: value entity
50+
<code>{Text(entity)}</code>
51+
^
52+
t1011.scala:25: error: not found: value entity
53+
<code>{Text(entity)}</code>
54+
^
55+
t1011.scala:26: error: not found: value entity
56+
<code>{Text(entity)}</code>
57+
^
58+
t1011.scala:27: error: not found: value entity
59+
<code>{Text(entity)}</code>
60+
^
61+
t1011.scala:28: error: not found: value entity
62+
<code>{Text(entity)}</code>
63+
^
64+
t1011.scala:29: error: not found: value entity
65+
<code>{Text(entity)}</code>
66+
^
67+
t1011.scala:30: error: not found: value entity
68+
<code>{Text(entity)}</code>
69+
^
70+
t1011.scala:31: error: not found: value entity
71+
<code>{Text(entity)}</code>
72+
^
73+
t1011.scala:32: error: not found: value entity
74+
<code>{Text(entity)}</code>
75+
^
76+
t1011.scala:33: error: not found: value entity
77+
<code>{Text(entity)}</code>
78+
^
79+
t1011.scala:34: error: not found: value entity
80+
<code>{Text(entity)}</code>
81+
^
82+
t1011.scala:35: error: not found: value entity
83+
<code>{Text(entity)}</code>
84+
^
85+
t1011.scala:36: error: not found: value entity
86+
<code>{Text(entity)}</code>
87+
^
88+
t1011.scala:37: error: not found: value entity
89+
<code>{Text(entity)}</code>
90+
^
91+
t1011.scala:38: error: not found: value entity
92+
<code>{Text(entity)}</code>
93+
^
94+
t1011.scala:39: error: not found: value entity
95+
<code>{Text(entity)}</code>
96+
^
97+
t1011.scala:40: error: not found: value entity
98+
<code>{Text(entity)}</code>
99+
^
100+
t1011.scala:41: error: not found: value entity
101+
<code>{Text(entity)}</code>
102+
^
103+
t1011.scala:42: error: not found: value entity
104+
<code>{Text(entity)}</code>
105+
^
106+
t1011.scala:43: error: not found: value entity
107+
<code>{Text(entity)}</code>
108+
^
109+
t1011.scala:44: error: not found: value entity
110+
<code>{Text(entity)}</code>
111+
^
112+
t1011.scala:45: error: not found: value entity
113+
<code>{Text(entity)}</code>
114+
^
115+
t1011.scala:46: error: not found: value entity
116+
<code>{Text(entity)}</code>
117+
^
118+
t1011.scala:47: error: not found: value entity
119+
<code>{Text(entity)}</code>
120+
^
121+
t1011.scala:48: error: not found: value entity
122+
<code>{Text(entity)}</code>
123+
^
124+
t1011.scala:49: error: not found: value entity
125+
<code>{Text(entity)}</code>
126+
^
127+
t1011.scala:50: error: not found: value entity
128+
<code>{Text(entity)}</code>
129+
^
130+
t1011.scala:51: error: not found: value entity
131+
<code>{Text(entity)}</code>
132+
^
133+
t1011.scala:52: error: not found: value entity
134+
<code>{Text(entity)}</code>
135+
^
136+
t1011.scala:53: error: not found: value entity
137+
<code>{Text(entity)}</code>
138+
^
139+
t1011.scala:54: error: not found: value entity
140+
<code>{Text(entity)}</code>
141+
^
142+
t1011.scala:55: error: not found: value entity
143+
<code>{Text(entity)}</code>
144+
^
145+
t1011.scala:56: error: not found: value entity
146+
<code>{Text(entity)}</code>
147+
^
148+
t1011.scala:57: error: not found: value entity
149+
<code>{Text(entity)}</code>
150+
^
151+
t1011.scala:58: error: not found: value entity
152+
<code>{Text(entity)}</code>
153+
^
154+
t1011.scala:59: error: not found: value entity
155+
<code>{Text(entity)}</code>
156+
^
157+
t1011.scala:60: error: not found: value entity
158+
<code>{Text(entity)}</code>
159+
^
160+
t1011.scala:61: error: not found: value entity
161+
<code>{Text(entity)}</code>
162+
^
163+
t1011.scala:62: error: not found: value entity
164+
<code>{Text(entity)}</code>
165+
^
166+
t1011.scala:63: error: not found: value entity
167+
<code>{Text(entity)}</code>
168+
^
169+
t1011.scala:64: error: not found: value entity
170+
<code>{Text(entity)}</code>
171+
^
172+
t1011.scala:65: error: not found: value entity
173+
<code>{Text(entity)}</code>
174+
^
175+
t1011.scala:66: error: not found: value entity
176+
<code>{Text(entity)}</code>
177+
^
178+
t1011.scala:67: error: not found: value entity
179+
<code>{Text(entity)}</code>
180+
^
181+
t1011.scala:68: error: not found: value entity
182+
<code>{Text(entity)}</code>
183+
^
184+
t1011.scala:69: error: not found: value entity
185+
<code>{Text(entity)}</code>
186+
^
187+
t1011.scala:70: error: not found: value entity
188+
<code>{Text(entity)}</code>
189+
^
190+
t1011.scala:71: error: not found: value entity
191+
<code>{Text(entity)}</code>
192+
^
193+
t1011.scala:72: error: not found: value entity
194+
<code>{Text(entity)}</code>
195+
^
196+
t1011.scala:73: error: not found: value entity
197+
<code>{Text(entity)}</code>
198+
^
199+
t1011.scala:74: error: not found: value entity
200+
<code>{Text(entity)}</code>
201+
^
202+
t1011.scala:75: error: not found: value entity
203+
<code>{Text(entity)}</code>
204+
^
205+
t1011.scala:76: error: not found: value entity
206+
<code>{Text(entity)}</code></dl>
207+
^
208+
69 errors found

0 commit comments

Comments
 (0)