diff --git a/.circleci/config.yml b/.circleci/config.yml
index 80faef9d9..3a3f065a0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -89,9 +89,9 @@ workflows:
java_version: jdk8
scala_version: 2.13.1
- scala_job:
- name: dotty-0.18
+ name: dotty-0.21
java_version: jdk8
- scala_version: 0.20.0-RC1
+ scala_version: 0.21.0-RC1
- scala_job:
name: jdk11_2.12
java_version: jdk11
@@ -103,7 +103,7 @@ workflows:
- scala_job:
name: jdk11_dotty
java_version: jdk11
- scala_version: 0.20.0-RC1
+ scala_version: 0.21.0-RC1
- scala_job:
name: jdk13_2.12
java_version: jdk13
@@ -115,7 +115,7 @@ workflows:
- scala_job:
name: jdk13_dotty
java_version: jdk13
- scala_version: 0.20.0-RC1
+ scala_version: 0.21.0-RC1
- scala_job:
name: jdk14_2.12
java_version: jdk14
@@ -127,7 +127,7 @@ workflows:
- scala_job:
name: jdk14_dotty
java_version: jdk14
- scala_version: 0.20.0-RC1
+ scala_version: 0.21.0-RC1
- scalajs_job:
name: sjs0.6_2.12
scala_version: 2.12.10
diff --git a/.travis.yml b/.travis.yml
index 3debe8338..8b499c29b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ import: scala/scala-dev:travis/default.yml
language: scala
scala:
- - 0.20.0-RC1
+ - 0.21.0-RC1
- 2.12.10
- 2.13.1
@@ -18,9 +18,9 @@ env:
matrix:
exclude:
- - scala: 0.20.0-RC1
+ - scala: 0.21.0-RC1
env: SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=8
- - scala: 0.20.0-RC1
+ - scala: 0.21.0-RC1
env: SCALAJS_VERSION=1.0.0-RC2 ADOPTOPENJDK=8
install:
diff --git a/jvm/src/test/scala/scala/xml/XMLTest.scala b/jvm/src/test/scala/scala/xml/XMLTest.scala
index 0ca1ff1ce..26336807f 100644
--- a/jvm/src/test/scala/scala/xml/XMLTest.scala
+++ b/jvm/src/test/scala/scala/xml/XMLTest.scala
@@ -116,7 +116,7 @@ class XMLTestJVM {
Elem(null, "title", e, sc, Text("Foundations of Programming Languages"))))
assertEquals("Peter BunemanDan SuciuData on ze web",
- (parsedxml2 \\ "book") { n: Node => (n \ "title") xml_== "Data on ze web" } toString)
+ (parsedxml2 \\ "book") { (n: Node) => (n \ "title") xml_== "Data on ze web" } toString)
assertTrue(
((NodeSeq.fromSeq(List(parsedxml2))) \\ "_") sameElements List(
@@ -408,7 +408,7 @@ class XMLTestJVM {
@UnitTest
def t5115 = {
- def assertHonorsIterableContract(i: Iterable[_]) = assertEquals(i.size, i.iterator.size)
+ def assertHonorsIterableContract(i: Iterable[_]) = assertEquals(i.size.toLong, i.iterator.size.toLong)
assertHonorsIterableContract(.attributes)
assertHonorsIterableContract(.attributes)
diff --git a/shared/src/main/scala/scala/xml/dtd/ElementValidator.scala b/shared/src/main/scala/scala/xml/dtd/ElementValidator.scala
index 45618f06c..31035989d 100644
--- a/shared/src/main/scala/scala/xml/dtd/ElementValidator.scala
+++ b/shared/src/main/scala/scala/xml/dtd/ElementValidator.scala
@@ -70,12 +70,11 @@ class ElementValidator() extends Function1[Node, Boolean] {
for (attr <- md) {
def attrStr = attr.value.toString
def find(Key: String): Option[AttrDecl] = {
- adecls.zipWithIndex find {
+ adecls.zipWithIndex collectFirst {
case (a@AttrDecl(Key, _, _), j) =>
- ok += j; return Some(a)
- case _ => false
+ ok += j
+ a
}
- None
}
find(attr.key) match {
diff --git a/shared/src/main/scala/scala/xml/include/sax/XIncludeFilter.scala b/shared/src/main/scala/scala/xml/include/sax/XIncludeFilter.scala
index 4923cb1da..2470d5f64 100644
--- a/shared/src/main/scala/scala/xml/include/sax/XIncludeFilter.scala
+++ b/shared/src/main/scala/scala/xml/include/sax/XIncludeFilter.scala
@@ -291,10 +291,10 @@ class XIncludeFilter extends XMLFilterImpl {
val reader = new InputStreamReader(in, encoding)
val c = new Array[Char](1024)
var charsRead: Int = 0 // bogus init value
- do {
+ while ({ {
charsRead = reader.read(c, 0, 1024)
if (charsRead > 0) this.characters(c, 0, charsRead)
- } while (charsRead != -1)
+ } ; charsRead != -1}) ()
} catch {
case e: UnsupportedEncodingException =>
throw new SAXException("Unsupported encoding: "
diff --git a/shared/src/main/scala/scala/xml/parsing/MarkupParserCommon.scala b/shared/src/main/scala/scala/xml/parsing/MarkupParserCommon.scala
index caf165dfd..804891442 100644
--- a/shared/src/main/scala/scala/xml/parsing/MarkupParserCommon.scala
+++ b/shared/src/main/scala/scala/xml/parsing/MarkupParserCommon.scala
@@ -115,8 +115,8 @@ private[scala] trait MarkupParserCommon extends TokenTests {
val buf = new StringBuilder
- do buf append ch_returning_nextch
- while (isNameChar(ch))
+ while ({ buf append ch_returning_nextch
+ ; isNameChar(ch)}) ()
if (buf.last == ':') {
reportSyntaxError("name cannot end in ':'")
diff --git a/shared/src/test/scala/scala/xml/AttributeTest.scala b/shared/src/test/scala/scala/xml/AttributeTest.scala
index e1e7f911a..84cebbeb6 100644
--- a/shared/src/test/scala/scala/xml/AttributeTest.scala
+++ b/shared/src/test/scala/scala/xml/AttributeTest.scala
@@ -24,7 +24,7 @@ class AttributeTest {
appended = appended.next
len = len + 1
}
- assertEquals("removal of duplicates for unprefixed attributes in append", 1, len)
+ assertEquals("removal of duplicates for unprefixed attributes in append", 1L, len.toLong)
}
@Test
@@ -151,7 +151,7 @@ class AttributeTest {
def attributePathTwoChildrenWithAttributes: Unit = {
val xml =
val b = xml \ "b"
- assertEquals(2, b.length)
+ assertEquals(2, b.length.toLong)
assertEquals(NodeSeq.fromSeq(Seq(, )), b)
val barFail = b \ "@bar"
val barList = b.map(_ \ "@bar")
diff --git a/shared/src/test/scala/scala/xml/UtilityTest.scala b/shared/src/test/scala/scala/xml/UtilityTest.scala
index 765b9bad8..de4a8c29e 100644
--- a/shared/src/test/scala/scala/xml/UtilityTest.scala
+++ b/shared/src/test/scala/scala/xml/UtilityTest.scala
@@ -194,7 +194,7 @@ class UtilityTest {
'\u001F' -> "^_", // Unit separator
'\u007F' -> "^?" // Delete
).toMap.withDefault {
- key: Char => key.toString
+ (key: Char) => key.toString
}
def issue73StartsWithAndEndsWithWSInFirst: Unit = {
diff --git a/shared/src/test/scala/scala/xml/XMLSyntaxTest.scala b/shared/src/test/scala/scala/xml/XMLSyntaxTest.scala
index 913c027f0..26410a9af 100644
--- a/shared/src/test/scala/scala/xml/XMLSyntaxTest.scala
+++ b/shared/src/test/scala/scala/xml/XMLSyntaxTest.scala
@@ -29,16 +29,16 @@ class XMLSyntaxTest {
assertEquals(1.5, handle[Double](xb), 0.0)
val xc = { 5 }
- assertEquals(5, handle[Int](xc))
+ assertEquals(5, handle[Int](xc).toLong)
val xd = { true }
assertEquals(true, handle[Boolean](xd))
val xe = { 5:Short }
- assertEquals((5:Short), handle[Short](xe))
+ assertEquals((5:Short).toLong, handle[Short](xe).toLong)
val xf = { val x = 27; x }
- assertEquals(27, handle[Int](xf))
+ assertEquals(27, handle[Int](xf).toLong)
val xg = { List(1,2,3,4) }
assertEquals("1 2 3 4", xg.toString)
diff --git a/shared/src/test/scala/scala/xml/XMLTest.scala b/shared/src/test/scala/scala/xml/XMLTest.scala
index 1e0a304c7..d88b6c80e 100644
--- a/shared/src/test/scala/scala/xml/XMLTest.scala
+++ b/shared/src/test/scala/scala/xml/XMLTest.scala
@@ -461,7 +461,7 @@ Ours is the portal of hope, come as you are."
@UnitTest
def t5115 = {
- def assertHonorsIterableContract(i: Iterable[_]) = assertEquals(i.size, i.iterator.size)
+ def assertHonorsIterableContract(i: Iterable[_]) = assertEquals(i.size.toLong, i.iterator.size.toLong)
assertHonorsIterableContract(.attributes)
assertHonorsIterableContract(.attributes)