Make writeReplace Scala version-specific

Author: ashawley

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

@@ -20,3 +20,7 @@ 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
+}

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

@@ -24,3 +24,7 @@ private[xml] trait ScalaVersionSpecificNodeSeq
 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
+}

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

@@ -82,6 +82,7 @@ abstract class MetaData
   extends AbstractIterable[MetaData]
   with Iterable[MetaData]
   with Equality
+  with ScalaVersionSpecificIterableSerializable[MetaData]
   with Serializable {
 
   /**
@@ -225,6 +226,4 @@ abstract class MetaData
 
   final def remove(namespace: String, owner: Node, key: String): MetaData =
     remove(namespace, owner.scope, key)
-
-  protected[this] override def writeReplace(): AnyRef = this
 }

Diff for: 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 Serializable {
+abstract class NodeSeq extends AbstractSeq[Node] with immutable.Seq[Node] with ScalaVersionSpecificNodeSeq with Equality with ScalaVersionSpecificIterableSerializable[Node] with Serializable {
   def theSeq: Seq[Node]
   def length = theSeq.length
   override def iterator = theSeq.iterator
@@ -158,6 +158,4 @@ abstract class NodeSeq extends AbstractSeq[Node] with immutable.Seq[Node] with S
   override def toString(): String = theSeq.mkString
 
   def text: String = (this map (_.text)).mkString
-
-  protected[this] override def writeReplace(): AnyRef = this
 }