Merge pull request #513 from ashawley/drop-properties-trait

Drop the scala.xml.Properties

Author: SethTisue

Diff for: build.sbt

@@ -67,6 +67,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

Diff for: jvm/src/test/scala-2.x/scala/xml/CompilerErrors.scala

@@ -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>

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

@@ -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]
-}

Diff for: shared/src/test/scala/scala/xml/Properties.scala

@@ -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]
+}