Skip to content

Commit a4eeda8

Browse files
committed
Drop scala.xml.factory.Binder
1 parent b95f44d commit a4eeda8

File tree

6 files changed

+6
-388
lines changed

6 files changed

+6
-388
lines changed

build.sbt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,15 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
9090
exclude[MissingTypesProblem]("scala.xml.Text"),
9191
exclude[MissingTypesProblem]("scala.xml.Unparsed"),
9292
// Miscellaneous deprecations
93+
exclude[MissingClassProblem]("scala.xml.dtd.Scanner"),
94+
exclude[MissingClassProblem]("scala.xml.dtd.ContentModelParser$"),
95+
exclude[MissingClassProblem]("scala.xml.dtd.ContentModelParser"),
96+
exclude[MissingClassProblem]("scala.xml.factory.Binder"),
97+
exclude[MissingClassProblem]("scala.xml.parsing.ValidatingMarkupHandler"),
9398
exclude[MissingClassProblem]("scala.xml.persistent.CachedFileStorage"),
9499
exclude[MissingClassProblem]("scala.xml.persistent.Index"),
95100
exclude[MissingClassProblem]("scala.xml.persistent.SetStorage"),
101+
exclude[DirectMissingMethodProblem]("scala.xml.dtd.ContentModel.parse"),
96102
exclude[DirectMissingMethodProblem]("scala.xml.Elem.this"),
97103
exclude[DirectMissingMethodProblem]("scala.xml.Elem.apply"),
98104
exclude[DirectMissingMethodProblem]("scala.xml.Elem.processXml"),

shared/src/main/scala/scala/xml/dtd/ContentModel.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ object ContentModel extends WordExp {
3939

4040
def isMixed(cm: ContentModel) = cond(cm) { case _: MIXED => true }
4141
def containsText(cm: ContentModel) = (cm == PCDATA) || isMixed(cm)
42-
def parse(s: String): ContentModel = ContentModelParser.parse(s)
4342

4443
def getLabels(r: RegExp): Set[String] = {
4544
def traverse(r: RegExp): Set[String] = r match { // !!! check for match translation problem

shared/src/main/scala/scala/xml/dtd/ContentModelParser.scala

Lines changed: 0 additions & 137 deletions
This file was deleted.

shared/src/main/scala/scala/xml/dtd/Scanner.scala

Lines changed: 0 additions & 89 deletions
This file was deleted.

shared/src/main/scala/scala/xml/factory/Binder.scala

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)