8000 Upgrade to Scala 2.10.5 and 2.11.6. · commonlisp/scala-js@0a30bb3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0a30bb3

Browse files
sjrdsjrd
committed
Upgrade to Scala 2.10.5 and 2.11.6.
1 parent db516a8 commit 0a30bb3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+5404
-41
lines changed

‎DEVELOPING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,5 +124,5 @@ following incantations.
124124

125125
> ++SCALA_VERSION
126126
> ;compiler/publishLocal;library/publishLocal;javalibEx/publishLocal;testInterface/publishLocal;stubs/publishLocal
127-
> ++2.10.4
127+
> ++2.10.5
128128
> ;ir/publishLocal;tools/publishLocal;jsEnvs/publishLocal;testAdapter/publishLocal;sbtPlugin/publishLocal

‎ci/checksizes.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ case $FULLVER in
88
2.10.2)
99
VER=2.10
1010
;;
11-
2.11.5)
11+
2.11.6)
1212
VER=2.11
1313
;;
14-
2.10.3|2.10.4|2.11.0|2.11.1|2.11.2|2.11.4)
14+
2.10.3|2.10.4|2.10.5|2.11.0|2.11.1|2.11.2|2.11.4|2.11.5)
1515
echo "Ignoring checksizes for Scala $FULLVER"
1616
exit 0
1717
;;
@@ -36,7 +36,7 @@ case $FULLVER in
3636
REVERSI_PREOPT_GZ_EXPECTEDSIZE=93000
3737
REVERSI_OPT_GZ_EXPECTEDSIZE=40000
3838
;;
39-
2.11.5)
39+
2.11.6)
4040
REVERSI_PREOPT_EXPECTEDSIZE=714000
4141
REVERSI_OPT_EXPECTEDSIZE=142000
4242
REVERSI_PREOPT_GZ_EXPECTEDSIZE=88000

‎ci/matrix.xml

Lines changed: 70 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@
121121

122122
<task id="sbtplugin-test"><![CDATA[
123123
# Publish Scala.js artifacts locally
124-
sbt ++2.11.5 compiler/publishLocal library/publishLocal javalibEx/publishLocal \
124+
sbt ++2.11.6 compiler/publishLocal library/publishLocal javalibEx/publishLocal \
125125
testInterface/publishLocal jasmineTestFramework/publishLocal stubs/publishLocal \
126-
++2.10.4 ir/publishLocal tools/publishLocal jsEnvs/publishLocal \
126+
++2.10.5 ir/publishLocal tools/publishLocal jsEnvs/publishLocal \
127127
testAdapter/publishLocal sbtPlugin/publishLocal
128128
# Go into standalone project and test
129129
cd sbt-plugin-test
@@ -163,15 +163,15 @@
163163
<v n="java">1.8</v>
164164
</run>
165165
<run task="main">
166-
<v n="scala">2.11.5</v>
166+
<v n="scala">2.11.6</v>
167167
<v n="java">1.6</v>
168168
</run>
169169
<run task="main">
170-
<v n="scala">2.11.5 10000 </v>
170+
<v n="scala">2.11.6</v>
171171
<v n="java">1.7</v>
172172
</run>
173173
<run task="main">
174-
<v n="scala">2.11.5</v>
174+
<v n="scala">2.11.6</v>
175175
<v n="java">1.8</v>
176176
</run>
177177

@@ -190,35 +190,34 @@
190190
</run>
191191
<!-- Tools do not compile on JDK6, Scala 2.11.x (see #1235) -->
192192
<run task="bootstrap">
193-
<v n="scala">2.11.5</v>
193+
<v n="scala">2.11.6</v>
194194
<v n="java">1.7</v>
195195
</run>
196196
<run task="bootstrap">
197-
<v n="scala">2.11.5</v>
197+
<v n="scala">2.11.6</v>
198198
<v n="java">1.8</v>
199199
</run>
200-
<!-- Tools do not compile on Scala 2.11.4 (see #1215). -->
201200

202201
<!-- Tools / CLI / Stubs / sbtPlugin test tasks -->
203202
<run task="tools-cli-stubs-sbtplugin">
204-
<v n="scala">2.10.4</v>
203+
<v n="scala">2.10.5</v>
205204
<v n="java">1.6</v>
206205
</run>
207206
<run task="tools-cli-stubs-sbtplugin">
208-
<v n="scala">2.10.4</v>
207+
<v n="scala">2.10.5</v>
209208
<v n="java">1.7</v>
210209
</run>
211210
<run task="tools-cli-stubs-sbtplugin">
212-
<v n="scala">2.10.4</v>
211+
<v n="scala">2.10.5</v>
213212
<v n="java">1.8</v>
214213
</run>
215214
<!-- Tools do not compile on JDK6, Scala 2.11.x (see #1235) -->
216215
<run task="tools-cli-stubs">
217-
<v n="scala">2.11.5</v>
216+
<v n="scala">2.11.6</v>
218217
<v n="java">1.7</v>
219218
</run>
220219
<run task="tools-cli-stubs">
221-
<v n="scala">2.11.5</v>
220+
<v n="scala">2.11.6</v>
222221
<v n="java">1.8</v>
223222
</run>
224223

@@ -228,7 +227,7 @@
228227
<v n="java">1.7</v>
229228
</run>
230229
<run task="partestc">
231-
<v n="scala">2.11.5</v>
230+
<v n="scala">2.11.6</v>
232231
<v n="java">1.7</v>
233232
</run>
234233

@@ -245,14 +244,18 @@
245244
</run>
246245
<run task="main">
247246
<v n="scala">2.10.4</v>
247+
<v n="java">1.7</v>
248+
</run>
249+
<run task="main">
250+
<v n="scala">2.10.5</v>
248251
<v n="java">1.6</v>
249252
</run>
250253
<run task="main">
251-
<v n="scala">2.10.4</v>
254+
<v n="scala">2.10.5</v>
252255
<v n="java">1.7</v>
253256
</run>
254257
<run task="main">
255-
<v n="scala">2.10.4</v>
258+
<v n="scala">2.10.5</v>
256259
<v n="java">1.8</v>
257260
</run>
258261
<run task="main">
@@ -287,6 +290,18 @@
287290
<v n="scala">2.11.4</v>
288291
<v n="java">1.8</v>
289292
</run>
293+
<run task="main">
294+
<v n="scala">2.11.5</v>
295+
<v n="java">1.6</v>
296+
</run>
297+
<run task="main">
298+
<v n="scala">2.11.5</v>
299+
<v n="java">1.7</v>
300+
</run>
301+
<run task="main">
302+
<v n="scala">2.11.5</v>
303+
<v n="java">1.8</v>
304+
</run>
290305

291306
<!-- Bootstrap test tasks (all remaining Scala versions) -->
292307
<run task="bootstrap">
@@ -295,14 +310,18 @@
295310
</run>
296311
<run task="bootstrap">
297312
<v n="scala">2.10.4</v>
313+
<v n="java">1.7</v>
314+
</run>
315+
<run task="bootstrap">
316+
<v n="scala">2.10.5</v>
298317
<v n="java">1.6</v>
299318
</run>
300319
<run task="bootstrap">
301-
<v n="scala">2.10.4</v>
320+
<v n="scala">2.10.5</v>
302321
<v n="java">1.7</v>
303322
</run>
304323
<run task="bootstrap">
305-
<v n="scala">2.10.4</v>
324+
<v n="scala">2.10.5</v>
306325
<v n="java">1.8</v>
307326
</run>
308327
<run task="bootstrap">
@@ -317,22 +336,26 @@
317336
<v n="scala">2.11.2</v>
318337
<v n="java">1.7</v>
319338
</run>
339+
<!-- Tools do not compile on Scala 2.11.4 (see #1215). -->
320340
<run task="bootstrap">
321-
<v n="scala">2.11.2</v>
341+
<v n="scala">2.11.5</v>
342+
<v n="java">1.7</v>
343+
</run>
344+
<run task="bootstrap">
345+
<v n="scala">2.11.5</v>
322346
<v n="java">1.8</v>
323347
</run>
324-
<!-- Tools do not compile on Scala 2.11.4 (see #1215). -->
325348

326349
<run task="partest-noopt">
327-
<v n="scala">2.11.5</v>
350+
<v n="scala">2.11.6</v>
328351
<v n="java">1.7</v>
329352
</run>
330353
<run task="partest-fastopt">
331-
<v n="scala">2.11.5</v>
354+
<v n="scala">2.11.6</v>
332355
<v n="java">1.7</v>
333356
</run>
334357
<run task="partest-fullopt">
335-
<v n="scala">2.11.5</v>
358+
<v n="scala">2.11.6</v>
336359
<v n="java">1.7</v>
337360
</run>
338361
</matrix>
@@ -389,6 +412,18 @@
389412
<v n="java">1.8</v>
390413
</run>
391414
<!-- Partest does not compile on Scala 2.11.4 (see #1215). -->
415+
<run task="partest-noopt">
416+
<v n="scala">2.11.5</v>
417+
<v n="java">1.7</v>
418+
</run>
419+
<run task="partest-fastopt">
420+
<v n="scala">2.11.5</v>
421+
<v n="java">1.7</v>
422+
</run>
423+
<run task="partest-fullopt">
424+
<v n="scala">2.11.5</v>
425+
<v n="java">1.7</v>
426+
</run>
392427
<run task="partest-noopt">
393428
<v n="scala">2.11.5</v>
394429
<v n="java">1.8</v>
@@ -401,6 +436,18 @@
401436
<v n="scala">2.11.5</v>
402437
<v n="java">1.8</v>
403438
</run>
439+
<run task="partest-noopt">
440+
<v n="scala">2.11.6</v>
441+
<v n="java">1.8</v>
442+
</run>
443+
<run task="partest-fastopt">
444+
<v n="scala">2.11.6</v>
445+
<v n="java">1.8</v>
446+
</run>
447+
<run task="partest-fullopt">
448+
<v n="scala">2.11.6</v>
449+
<v n="java">1.8</v>
450+
</run>
404451
<!--
405452
Partest does sometimes not compile on JDK6 (see #1227) we
406453
therefore do not run any JDK6 partests.

0 commit comments

Comments
 (0)
0