Skip to content

Commit 4a798e1

Browse files
committed
Use 2.13.0-RC1 release candidate
1 parent 5bb1af0 commit 4a798e1

File tree

6 files changed

+5
-13
lines changed

6 files changed

+5
-13
lines changed

Diff for: .travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jdk:
1616
scala:
1717
- 2.11.12
1818
- 2.12.8
19-
- 2.13.0-M5
19+
- 2.13.0-RC1
2020

2121
env:
2222
global:
@@ -46,7 +46,7 @@ matrix:
4646
jdk: openjdk11
4747
- scala: 2.12.8
4848
jdk: openjdk6
49-
- scala: 2.13.0-M5
49+
- scala: 2.13.0-RC1
5050
jdk: openjdk6
5151

5252
before_script:

Diff for: build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import sbtcrossproject.{crossProject, CrossType}
22
import ScalaModulePlugin._
33

4-
crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12", "2.13.0-M5")
4+
crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12", "2.13.0-RC1")
55

66
lazy val xml = crossProject(JSPlatform, JVMPlatform)
77
.withoutSuffixFor(JVMPlatform)

Diff for: shared/src/main/scala-2.11-2.12/scala/xml/ScalaVersionSpecific.scala

-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,3 @@ private[xml] trait ScalaVersionSpecificNodeSeq extends SeqLike[Node, NodeSeq] {
2020
private[xml] trait ScalaVersionSpecificNodeBuffer { self: NodeBuffer =>
2121
override def stringPrefix: String = "NodeBuffer"
2222
}
23-
24-
private[xml] trait ScalaVersionSpecificIterableSerializable[+A] { // extends Iterable[A] {
25-
// protected[this] override def writeReplace(): AnyRef = this
26-
}

Diff for: shared/src/main/scala-2.13/scala/xml/ScalaVersionSpecific.scala

+1-4
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,9 @@ private[xml] trait ScalaVersionSpecificNodeSeq
1919
with StrictOptimizedSeqOps[Node, immutable.Seq, NodeSeq] { self: NodeSeq =>
2020
override def fromSpecific(coll: IterableOnce[Node]): NodeSeq = (NodeSeq.newBuilder ++= coll).result()
2121
override def newSpecificBuilder: mutable.Builder[Node, NodeSeq] = NodeSeq.newBuilder
22+
override def empty: NodeSeq = NodeSeq.Empty
2223
}
2324

2425
private[xml] trait ScalaVersionSpecificNodeBuffer { self: NodeBuffer =>
2526
override def className: String = "NodeBuffer"
2627
}
27-
28-
private[xml] trait ScalaVersionSpecificIterableSerializable[+A] extends Iterable[A] {
29-
protected[this] override def writeReplace(): AnyRef = this
30-
}

Diff for: shared/src/main/scala/scala/xml/MetaData.scala

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ abstract class MetaData
8282
extends AbstractIterable[MetaData]
8383
with Iterable[MetaData]
8484
with Equality
85-
with ScalaVersionSpecificIterableSerializable[MetaData]
8685
with Serializable {
8786

8887
/**

Diff for: shared/src/main/scala/scala/xml/NodeSeq.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ object NodeSeq {
4444
*
4545
* @author Burak Emir
4646
*/
47-
abstract class NodeSeq extends AbstractSeq[Node] with immutable.Seq[Node] with ScalaVersionSpecificNodeSeq with Equality with ScalaVersionSpecificIterableSerializable[Node] with Serializable {
47+
abstract class NodeSeq extends AbstractSeq[Node] with immutable.Seq[Node] with ScalaVersionSpecificNodeSeq with Equality with Serializable {
4848
def theSeq: Seq[Node]
4949
def length = theSeq.length
5050
override def iterator = theSeq.iterator

0 commit comments

Comments
 (0)