Skip to content

Commit 266f60e

Browse files
committed
bump Scala, sbt, Scala.js versions
1 parent c60de43 commit 266f60e

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ language: scala
66

77
scala:
88
- 2.11.12
9-
- 2.12.10
10-
- 2.13.1
9+
- 2.12.12
10+
- 2.13.3
1111

1212
env:
1313
- SCALAJS_VERSION= ADOPTOPENJDK=8
14-
- SCALAJS_VERSION=0.6.32 ADOPTOPENJDK=8
14+
- SCALAJS_VERSION=0.6.33 ADOPTOPENJDK=8
1515
- SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8
1616
- SCALAJS_VERSION= ADOPTOPENJDK=11
1717

1818
matrix:
1919
exclude:
2020
- scala: 2.11.12
21-
env: SCALAJS_VERSION=0.6.32 ADOPTOPENJDK=8
21+
env: SCALAJS_VERSION=0.6.33 ADOPTOPENJDK=8
2222
- scala: 2.11.12
2323
env: SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8
2424

jvm/src/test/scala/scala/xml/CompilerErrors.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.junit.Test
55
class CompilerErrors extends CompilerTesting {
66
@Test
77
def t7185() =
8-
expectXmlError("""|overloaded method value apply with alternatives:
8+
expectXmlError("""|overloaded method apply with alternatives:
99
| (f: scala.xml.Node => Boolean)scala.xml.NodeSeq <and>
1010
| (i: Int)scala.xml.Node
1111
| cannot be applied to ()""".stripMargin,

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.3.8
1+
sbt.version=1.3.13

0 commit comments

Comments
 (0)