Skip to content

Drop the scala.xml.Properties #513

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 1 commit into from
May 13, 2021
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
1 change: 1 addition & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
Seq(
// because we reverted #279
exclude[DirectMissingMethodProblem]("scala.xml.Utility.escapeText"),
exclude[MissingClassProblem]("scala.xml.Properties*"),
// New MiMa checks for generic signature changes
exclude[IncompatibleSignatureProblem]("*"),
// afaict this is just a JDK 8 vs 16 difference, producing a false positive when
Expand Down
2 changes: 1 addition & 1 deletion jvm/src/test/scala-2.x/scala/xml/CompilerErrors.scala
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class CompilerErrors extends CompilerTesting {
// the error message here differs a bit by Scala version
import util.Properties.versionNumberString
val thing =
if (versionNumberString.startsWith("2.11") || versionNumberString.startsWith("2.12")) "method value"
if (versionNumberString.startsWith("2.12")) "method value"
else "method"
expectXmlError(s"""|overloaded $thing apply with alternatives:
| (f: scala.xml.Node => Boolean)scala.xml.NodeSeq <and>
Expand Down
5 changes: 0 additions & 5 deletions shared/src/main/scala/scala/xml/XML.scala
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,3 @@ object XML extends XMLLoader[Elem] {
w.write(Utility.serialize(node, minimizeTags = minimizeTags).toString)
}
}

object Properties extends scala.util.PropertiesTrait {
protected def propCategory = "scala-xml"
protected def pickJarBasedOn = classOf[scala.xml.Node]
}
19 changes: 19 additions & 0 deletions shared/src/test/scala/scala/xml/Properties.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*
* Scala (https://www.scala-lang.org)
*
* Copyright EPFL and Lightbend, Inc.
*
* Licensed under Apache License 2.0
* (http://www.apache.org/licenses/LICENSE-2.0).
*
* See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
*/

package scala
package xml

object Properties extends util.PropertiesTrait {
protected def propCategory = "scala-xml"
protected def pickJarBasedOn = classOf[scala.xml.Node]
}