Merge branch 'main' into mima-signature-checks

Author: SethTisue

.circleci/config.yml

@@ -10,9 +10,6 @@ executors:
   scala_jdk16_executor:
     docker:
       - image: circleci/openjdk:16-buster
-  scala_native_executor:
-    machine:
-      image: ubuntu-1604:202004-01
 
 commands:
   sbt_cmd:
@@ -77,7 +74,7 @@ jobs:
           scala_version: << parameters.scala_version >>
           sbt_tasks: xmlJS/update xmlJS/compile xmlJS/Test/compile xmlJS/test xmlJS/doc xmlJS/package
   scalanative_job:
-    executor: scala_native_executor
+    executor: scala_jdk8_executor
     parameters:
       scala_version:
         description: "Scala version"
@@ -94,12 +91,10 @@ jobs:
       - run:
           name: Install dependencies
           command: |
-            echo "deb https://dl.bintray.com/sbt/debian /" | sudo tee -a /etc/apt/sources.list.d/sbt.list
-            curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | sudo apt-key add
             sudo apt-get update
-            sudo apt-get install -y sbt clang-8 openjdk-8-jdk
-            sudo ln -s /usr/lib/llvm-8/bin/clang /usr/bin/clang
-            sudo ln -s /usr/lib/llvm-8/bin/clang++ /usr/bin/clang++
+            sudo apt-get install -y clang-7
+            sudo ln -s /usr/lib/llvm-7/bin/clang /usr/local/bin/clang
+            sudo ln -s /usr/lib/llvm-7/bin/clang++ /usr/local/bin/clang++
       - sbt_cmd:
           scala_version: << parameters.scala_version >>
           sbt_tasks: xmlNative/update xmlNative/compile xmlNative/test:compile xmlNative/test xmlNative/doc xmlNative/package

build.sbt

@@ -32,6 +32,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .jvmSettings(ScalaModulePlugin.scalaModuleOsgiSettings)
   .settings(
     name    := "scala-xml",
+    scalaModuleAutomaticModuleName := Some("scala.xml"),
     scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((3, _)) =>
         Seq("-language:Scala2")
@@ -55,6 +56,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
           |additional information regarding copyright ownership.
           |""".stripMargin)),
 
+    // Note: See discussion on Mima in https://github.com/scala/scala-xml/pull/517
     scalaModuleMimaPreviousVersion := (CrossVersion.partialVersion(scalaVersion.value) match {
       // pending resolution of https://github.com/scalacenter/sbt-version-policy/issues/62
       case Some((3, _)) => None
@@ -65,8 +67,12 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
       import com.typesafe.tools.mima.core._
       import com.typesafe.tools.mima.core.ProblemFilters._
       Seq(
+        // Deprecated in 2.0.0-RC2
+        exclude[MissingClassProblem]("scala.xml.factory.LoggedNodeFactory"),
+        exclude[DirectMissingMethodProblem]("scala.xml.parsing.MarkupHandler.log"),
         // because we reverted #279
         exclude[DirectMissingMethodProblem]("scala.xml.Utility.escapeText"),
+        exclude[MissingClassProblem]("scala.xml.Properties*"),
         // afaict this is just a JDK 8 vs 16 difference, producing a false positive when
         // we compare classes built on JDK 16 (which we only do on CI, not at release time)
         // to previous-version artifacts that were built on 8.  see scala/scala-xml#501
@@ -121,7 +127,6 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   )
   .jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))
   .nativeSettings(
-    scalaModuleMimaPreviousVersion := None, // No such release yet
     // Scala Native cannot run forked tests
     Test / fork := false,
     libraryDependencies += "org.scala-native" %%% "junit-runtime" % nativeVersion % Test,

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>

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.0
+sbt.version=1.5.2

project/plugins.sbt

@@ -4,10 +4,10 @@ val scalaJSVersion =
 val scalaNativeVersion =
   Option(System.getenv("SCALANATIVE_VERSION")).filter(_.nonEmpty).getOrElse("0.4.0")
 
-addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.4")
+addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.3.0")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion)
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
-addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.0.0-RC5")
+addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.0.0")

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

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

@@ -129,7 +129,4 @@ abstract class MarkupHandler {
   def unparsedEntityDecl(name: String, extID: ExternalID, notat: String): Unit = ()
   def notationDecl(notat: String, extID: ExternalID): Unit = ()
   def reportSyntaxError(pos: Int, str: String): Unit
-
-  @deprecated("This method and its usages will be removed. Use a debugger to debug code.", "2.11")
-  def log(msg: String): Unit = {}
 }

shared/src/main/scala/scala/xml/parsing/MarkupHandler.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]
+}