Merge pull request #284 from ashawley/2.13.0-RC1

Use 2.13.0-RC1 release candidate

Author: ashawley

.travis.yml

@@ -16,7 +16,7 @@ jdk:
 scala:
   - 2.11.12
   - 2.12.8
-  - 2.13.0-M5
+  - 2.13.0-RC1
 
 env:
   global:
@@ -29,24 +29,24 @@ env:
   matrix:
     # The empty SCALAJS_VERSION will only compile for the JVM
     - SCALAJS_VERSION=
-    - SCALAJS_VERSION=0.6.26
-    - SCALAJS_VERSION=1.0.0-M6
+    - SCALAJS_VERSION=0.6.27
+    - SCALAJS_VERSION=1.0.0-M7
 
 matrix:
   exclude:
     - jdk: openjdk11
-      env: SCALAJS_VERSION=0.6.26
+      env: SCALAJS_VERSION=0.6.27
     - jdk: openjdk11
-      env: SCALAJS_VERSION=1.0.0-M6
+      env: SCALAJS_VERSION=1.0.0-M7
     - scala: 2.11.12
-      env: SCALAJS_VERSION=1.0.0-M6
+      env: SCALAJS_VERSION=1.0.0-M7
     - scala: 2.11.12
       jdk: oraclejdk8
     - scala: 2.11.12
       jdk: openjdk11
     - scala: 2.12.8
       jdk: openjdk6
-    - scala: 2.13.0-M5
+    - scala: 2.13.0-RC1
       jdk: openjdk6
 
 before_script:

build.sbt

@@ -1,7 +1,7 @@
 import sbtcrossproject.{crossProject, CrossType}
 import ScalaModulePlugin._
 
-crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12", "2.13.0-M5")
+crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12", "2.13.0-RC1")
 
 lazy val xml = crossProject(JSPlatform, JVMPlatform)
   .withoutSuffixFor(JVMPlatform)
@@ -29,7 +29,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
       )
     },
     mimaPreviousVersion := {
-      if (System.getenv("SCALAJS_VERSION") == "1.0.0-M6") None // No such release yet
+      if (System.getenv("SCALAJS_VERSION") == "1.0.0-M7") None // No such release yet
       else Some("1.1.1")
     },
 

project/plugins.sbt

@@ -6,7 +6,7 @@ else
   Seq(addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3"))
 
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.26")
+  Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.27")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")

shared/src/main/scala-2.11-2.12/scala/xml/ScalaVersionSpecific.scala

@@ -20,7 +20,3 @@ private[xml] trait ScalaVersionSpecificNodeSeq extends SeqLike[Node, NodeSeq] {
 private[xml] trait ScalaVersionSpecificNodeBuffer { self: NodeBuffer =>
   override def stringPrefix: String = "NodeBuffer"
 }
-
-private[xml] trait ScalaVersionSpecificIterableSerializable[+A] { // extends Iterable[A] {
-  // protected[this] override def writeReplace(): AnyRef = this
-}

shared/src/main/scala-2.13/scala/xml/ScalaVersionSpecific.scala

@@ -19,12 +19,9 @@ private[xml] trait ScalaVersionSpecificNodeSeq
     with StrictOptimizedSeqOps[Node, immutable.Seq, NodeSeq] { self: NodeSeq =>
   override def fromSpecific(coll: IterableOnce[Node]): NodeSeq = (NodeSeq.newBuilder ++= coll).result()
   override def newSpecificBuilder: mutable.Builder[Node, NodeSeq] = NodeSeq.newBuilder
+  override def empty: NodeSeq = NodeSeq.Empty
 }
 
 private[xml] trait ScalaVersionSpecificNodeBuffer { self: NodeBuffer =>
   override def className: String = "NodeBuffer"
 }
-
-private[xml] trait ScalaVersionSpecificIterableSerializable[+A] extends Iterable[A] {
-  protected[this] override def writeReplace(): AnyRef = this
-}

shared/src/main/scala/scala/xml/MetaData.scala

@@ -82,7 +82,6 @@ abstract class MetaData
   extends AbstractIterable[MetaData]
   with Iterable[MetaData]
   with Equality
-  with ScalaVersionSpecificIterableSerializable[MetaData]
   with Serializable {
 
   /**

shared/src/main/scala/scala/xml/NodeSeq.scala

@@ -44,7 +44,7 @@ object NodeSeq {
  *
  *  @author  Burak Emir
  */
-abstract class NodeSeq extends AbstractSeq[Node] with immutable.Seq[Node] with ScalaVersionSpecificNodeSeq with Equality with ScalaVersionSpecificIterableSerializable[Node] with Serializable {
+abstract class NodeSeq extends AbstractSeq[Node] with immutable.Seq[Node] with ScalaVersionSpecificNodeSeq with Equality with Serializable {
   def theSeq: Seq[Node]
   def length = theSeq.length
   override def iterator = theSeq.iterator