Merge pull request #293 from ashawley/drop-XMLEventReader

Drop XMLEventReader

Author: ashawley

build.sbt

@@ -28,8 +28,40 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
       import com.typesafe.tools.mima.core._
       import com.typesafe.tools.mima.core.ProblemFilters._
       Seq(
+        // scala-xml 1.1.1 deprecated XMLEventReader, so it broke
+        // binary compatibility for 2.0.0 in the following way:
+        exclude[MissingClassProblem]("scala.xml.pull.EvComment"),
+        exclude[MissingClassProblem]("scala.xml.pull.EvComment$"),
+        exclude[MissingClassProblem]("scala.xml.pull.EvElemEnd"),
+        exclude[MissingClassProblem]("scala.xml.pull.EvElemEnd$"),
+        exclude[MissingClassProblem]("scala.xml.pull.EvElemStart"),
+        exclude[MissingClassProblem]("scala.xml.pull.EvElemStart$"),
+        exclude[MissingClassProblem]("scala.xml.pull.EvEntityRef"),
+        exclude[MissingClassProblem]("scala.xml.pull.EvEntityRef$"),
+        exclude[MissingClassProblem]("scala.xml.pull.EvProcInstr"),
+        exclude[MissingClassProblem]("scala.xml.pull.EvProcInstr$"),
+        exclude[MissingClassProblem]("scala.xml.pull.EvText"),
+        exclude[MissingClassProblem]("scala.xml.pull.EvText$"),
+        exclude[MissingClassProblem]("scala.xml.pull.ExceptionEvent"),
+        exclude[MissingClassProblem]("scala.xml.pull.ExceptionEvent$"),
+        exclude[MissingClassProblem]("scala.xml.pull.ProducerConsumerIterator"),
+        exclude[MissingClassProblem]("scala.xml.pull.XMLEvent"),
+        exclude[MissingClassProblem]("scala.xml.pull.XMLEventReader"),
+        exclude[MissingClassProblem]("scala.xml.pull.XMLEventReader$POISON$"),
+        exclude[MissingClassProblem]("scala.xml.pull.XMLEventReader$Parser"),
+        exclude[MissingClassProblem]("scala.xml.pull.package"),
+        exclude[MissingClassProblem]("scala.xml.pull.package$"),
+        exclude[MissingTypesProblem]("scala.xml.Atom"),
+        exclude[MissingTypesProblem]("scala.xml.Comment"),
+        exclude[MissingTypesProblem]("scala.xml.Document"),
+        exclude[MissingTypesProblem]("scala.xml.EntityRef"),
+        exclude[MissingTypesProblem]("scala.xml.PCData"),
+        exclude[MissingTypesProblem]("scala.xml.ProcInstr"),
+        exclude[MissingTypesProblem]("scala.xml.SpecialNode"),
+        exclude[MissingTypesProblem]("scala.xml.Text"),
+        exclude[MissingTypesProblem]("scala.xml.Unparsed"),
         // Scala 2.12 deprecated mutable.Stack, so we broke
-        // binary compatibility for 1.1.0 in the following way:
+        // binary compatibility for 2.0.0 in the following way:
         exclude[IncompatibleMethTypeProblem]("scala.xml.parsing.FactoryAdapter.scopeStack_="),
         exclude[IncompatibleResultTypeProblem]("scala.xml.parsing.FactoryAdapter.hStack"),
         exclude[IncompatibleResultTypeProblem]("scala.xml.parsing.FactoryAdapter.scopeStack"),

jvm/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala

@@ -20,7 +20,7 @@ import scala.collection.Seq
  *  @author  Burak Emir
  */
 @SerialVersionUID(-2289320563321795109L)
-class Document extends NodeSeq with pull.XMLEvent with Serializable {
+class Document extends NodeSeq with Serializable {
 
   /**
    * An ordered list of child information items, in document

shared/src/main/scala/scala/xml/Document.scala

@@ -13,12 +13,9 @@ package xml
  * `SpecialNode` is a special XML node which represents either text
  *  `(PCDATA)`, a comment, a `PI`, or an entity ref.
  *
- *  `SpecialNode`s also play the role of [[scala.xml.pull.XMLEvent]]s for
- *  pull-parsing.
- *
  *  @author Burak Emir
  */
-abstract class SpecialNode extends Node with pull.XMLEvent {
+abstract class SpecialNode extends Node {
 
   /** always empty */
   final override def attributes = Null

shared/src/main/scala/scala/xml/SpecialNode.scala

@@ -117,5 +117,5 @@ object XML extends XMLLoader[Elem] {
 
 object Properties extends scala.util.PropertiesTrait {
   protected def propCategory    = "scala-xml"
-  protected def pickJarBasedOn  = classOf[scala.xml.pull.XMLEventReader]
+  protected def pickJarBasedOn  = classOf[scala.xml.Node]
 }