Skip to content

Drop XMLEventReader #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 33 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
195 changes: 0 additions & 195 deletions jvm/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala

This file was deleted.

2 changes: 1 addition & 1 deletion shared/src/main/scala/scala/xml/Document.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions shared/src/main/scala/scala/xml/SpecialNode.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion shared/src/main/scala/scala/xml/XML.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}
61 changes: 0 additions & 61 deletions shared/src/main/scala/scala/xml/pull/XMLEvent.scala

This file was deleted.

Loading