Merge branch 'master' into safe-defaults

.circleci/config.yml

@@ -0,0 +1,180 @@
+version: 2.1
+
+executors:
+  scala_jdk8_executor:
+    docker:
+      - image: circleci/openjdk:8-jdk-node
+  scala_jdk11_executor:
+    docker:
+      - image: circleci/openjdk:11-jdk
+  scala_jdk15_executor:
+    docker:
+      - image: circleci/openjdk:15-buster
+  scala_jdk16_executor:
+    docker:
+      - image: circleci/openjdk:16-buster
+  scala_native_executor:
+    machine:
+      image: ubuntu-1604:202004-01
+
+commands:
+  sbt_cmd:
+    description: "Build with sbt"
+    parameters:
+      scala_version:
+        type: string
+        default: 2.12.13
+      sbt_tasks:
+        type: string
+        default: update compile test:compile test doc package osgiBundle
+    steps:
+      - restore_cache:
+          keys:
+            - sbt-deps-v1-{{ checksum "build.sbt" }}
+            - sbt-deps-v1-
+      - run: sbt ++<< parameters.scala_version >> << parameters.sbt_tasks >>
+      - save_cache:
+          key: sbt-deps-v1-{{ checksum "build.sbt" }}
+          paths:
+            - "~/.cache/coursier"
+            - "~/.ivy2/cache"
+            - "~/.sbt"
+            - "~/.m2"
+
+jobs:
+  scala_job:
+    executor: scala_<<parameters.java_version>>_executor
+    parameters:
+      scala_version:
+        description: "Scala version"
+        default: 2.12.13
+        type: string
+      java_version:
+        description: "Java version"
+        default: jdk8
+        type: string
+    steps:
+      - checkout
+      - run: java -version
+      - sbt_cmd:
+          scala_version: << parameters.scala_version >>
+          sbt_tasks: xml/update xml/compile xml/test:compile xml/test xml/doc xml/package xml/osgiBundle
+  scalajs_job:
+    executor: scala_jdk8_executor
+    parameters:
+      scala_version:
+        description: "Scala version"
+        default: 2.12.13
+        type: string
+      scalajs_version:
+        description: "ScalaJS version"
+        default: 1.1.1
+        type: string
+    environment:
+      SCALAJS_VERSION: << parameters.scalajs_version >>
+    steps:
+      - checkout
+      - run: java -version
+      - run: node -v
+      - sbt_cmd:
+          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
+    parameters:
+      scala_version:
+        description: "Scala version"
+        default: 2.12.13
+        type: string
+      scalanative_version:
+        description: "Scala Native version"
+        default: 0.4.0
+        type: string
+    environment:
+      SCALANATIVE_VERSION: << parameters.scalanative_version >>
+    steps:
+      - checkout
+      - 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++
+      - sbt_cmd:
+          scala_version: << parameters.scala_version >>
+          sbt_tasks: xmlNative/update xmlNative/compile xmlNative/test:compile xmlNative/test xmlNative/doc xmlNative/package
+
+workflows:
+  build:
+    jobs:
+      - scala_job:
+          name: 2.12.13
+          java_version: jdk8
+          scala_version: 2.12.13
+      - scala_job:
+          name: 2.13.5
+          java_version: jdk8
+          scala_version: 2.13.5
+      - scala_job:
+          name: 3.0.0-RC1
+          java_version: jdk8
+          scala_version: 3.0.0-RC1
+      - scala_job:
+          name: 3.0.0-M3
+          java_version: jdk8
+          scala_version: 3.0.0-M3
+      - scala_job:
+          name: jdk11_2.12
+          java_version: jdk11
+          scala_version: 2.12.13
+      - scala_job:
+          name: jdk11_2.13
+          java_version: jdk11
+          scala_version: 2.13.5
+      - scala_job:
+          name: jdk11_3.0
+          java_version: jdk11
+          scala_version: 3.0.0-RC1
+      - scala_job:
+          name: jdk15_2.12
+          java_version: jdk15
+          scala_version: 2.12.13
+      - scala_job:
+          name: jdk15_2.13
+          java_version: jdk15
+          scala_version: 2.13.5
+      - scala_job:
+          name: jdk15_3.0
+          java_version: jdk15
+          scala_version: 3.0.0-RC1
+      - scala_job:
+          name: jdk16_2.12
+          java_version: jdk16
+          scala_version: 2.12.13
+      - scala_job:
+          name: jdk16_2.13
+          java_version: jdk16
+          scala_version: 2.13.5
+      - scala_job:
+          name: jdk16_3.0
+          java_version: jdk16
+          scala_version: 3.0.0-RC1
+      - scalajs_job:
+          name: sjs1.0_2.12
+          scala_version: 2.12.13
+          scalajs_version: 1.5.0
+      - scalajs_job:
+          name: sjs1.0_2.13
+          scala_version: 2.13.5
+          scalajs_version: 1.5.0
+      - scalanative_job:
+          name: native0.4_2.12
+          scala_version: 2.12.13
+          scalanative_version: 0.4.0
+      - scalanative_job:
+          name: native0.4_2.13
+          scala_version: 2.13.5
+          scalanative_version: 0.4.0

.gitignore

@@ -12,8 +12,6 @@
 *.jar
 *~
 
-build.properties
-
 # target directories for ant build
 /build/
 /dists/

.scalafmt.conf

@@ -0,0 +1 @@
+version = "2.7.4"

.travis.yml

@@ -1,37 +1,30 @@
-# opt-in to Travis's newer/faster container-based infrastructure
-sudo: false
+version: ~> 1.0 # needed for imports
 
-language: scala
+import: scala/scala-dev:travis/default.yml
 
-env:
-  global:
-    # PGP_PASSPHRASE
-    - secure: "BYC1kEnHjNrINrHYWPGEuTTJ2V340/0ByzqeihLecjoZ75yrjWdsh6MI1JEUWgv5kb+58vLzib21JfnjsPK6Yb2bSXuCFCsEtJNh6RJKgxkWlCOzfTSh5I2wl7PCjRClRL6gseX2uTSvFjL4Z//pmxwxeXlLp7voQe4QAUq1+sE="
-    # SONA_USER
-    - secure: "OpBwPc1GNvauageYOH3RscAa7wpZxgpmqDz15aigIKLNWzAhAtVUx0MleZ8rQeoqml6nrAvlnzuVHjKL2lVcjMPpjUis7bcQ5UAGK7tZK8x+qZNQxXmpXu8+pENwQA2yFaqt/xy7K5jFOrHJHTRxcPnyVG1yKakPWz53PPYUwbc="
-    # SONA_PASS
-    - secure: "Xw7rI/qlML1nD2e2XwlakkhKAWNGZKqqE+Q3ntTvFpfHryl7KLCvVzJ4LIavnL6kGJaWOgy9vlSoEWn5g9nqHSfE31C/k5pY5nTMAKiwiJzfAS+r0asKXW2gmKhwtcTBkqyLVOZLCJSPVlFRQyfBJHY+Fs0L3KWcnMQgtBlyDhU="
+language: scala
 
-script: admin/build.sh
+scala:
+  - 3.0.0-RC1
+  - 3.0.0-M3
+  - 2.12.13
+  - 2.13.5
 
-addons:
-  apt:
-    packages:
-      - openjdk-6-jdk
+env:
+  - SCALAJS_VERSION=          ADOPTOPENJDK=8
+  - SCALAJS_VERSION=1.5.0     ADOPTOPENJDK=8
+  - SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
+  - SCALAJS_VERSION=          ADOPTOPENJDK=11
+  - SCALAJS_VERSION=          ADOPTOPENJDK=15
 
-jdk:
-  - openjdk6
-  - oraclejdk8
-  - oraclejdk9
+jobs:
+  exclude:
+    - scala: 3.0.0-M3
+      env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
+    - scala: 3.0.0-RC1
+      env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
 
-notifications:
-  email: [email protected]
+install:
+  - git fetch --tags # get all tags for sbt-dynver
 
-before_cache:
-  - find $HOME/.sbt -name "*.lock" | xargs rm
-  - find $HOME/.ivy2/cache -name "ivydata-*.properties" | xargs rm
-cache:
-  directories:
-  - $HOME/.ivy2/cache
-  - $HOME/.sbt/boot
-  - $HOME/.sbt/launchers
+script: ./build.sh

CHANGELOG.md

@@ -0,0 +1,70 @@
+# Scala XML Changes
+
+## 2.0.0-M2 (2020-09-15)
+
+Published for Scala 2.12 and 2.13, Scala.js 1.2.0,
+and Dotty 0.27.0-RC1.
+
+### Removed
+
+- Removed `scala.xml.dtd.ElementValidator`
+
+## 2.0.0-M1 (2019-10-21)
+
+Not binary compatible with Scala XML 1.2.0.
+
+Published for Scala 2.12, 2.13 and Scala.js 0.6, 1.0.0-M8.
+Artifacts are no longer published for Scala 2.11.
+
+Some deprecated elements have been removed; see the "[Removed](#Removed)" section below.
+
+### Added
+
+- The `apiURL` is now published in ivy metadata so that hyperlinks
+  exist in downstream projects that reference Scala XML in their
+  Scaladocs.
+
+### Changed
+
+- Changed use of `scala.collection.mutable.Stack` in `FactoryAdapter` to a
+  `scala.collection.immutable.List`.  These members were affected.
+  - `attribStack`
+  - `hStack`
+  - `tagStack`
+  - `scopeStack`
+- The abstract class `FactoryAdapter`, see above, is used elsewhere
+  within the library, as well, so the previous changes are also
+  inherited by:
+    - `scala.xml.parsing.NoBindingFactoryAdapter` implemented class
+    - `scala.xml.factory.XMLLoader.adapter` static member
+
+### Fixed
+
+- Attribute order is preserved for XML elements, not reversed.
+- Don't escape quotes in `scala.xml.PCData` and `CDATA` as an XML `"`
+
+### Removed
+
+Most of these deletions are of vestigial code that is either unused,
+of poor quality or both.  Very few users of Scala XML will even notice
+the removed parts.  Most users will not be affected.
+
+The deletions represent about one thousand lines of code (sloc).  By
+comparison Scala XML is 10,000 sloc, so this is about 10% reduction in
+sloc.  The code that supports XML literals is maintained upstream in
+the Scala compiler, not in the Scala XML library.
+
+- Remove deprecated `scala.xml.pull.XMLEventReader`
+- Remove deprecated versions of `scala.xml.Elem` constructors
+- Remove deprecated `scala.xml.Elem.xmlToProcess` and
+  `scala.xml.Elem.processXml`
+- Remove deprecated definitions under `scala.xml.persistent`
+  - `CachedFileStorage`
+  - `Index`
+  - `SetStorage`
+- Remove `scala.xml.dtd.impl.PointedHedgeExp`
+- Remove `scala.xml.dtd.Scanner`
+- Remove `scala.xml.dtd.ContentModelParser`
+- Remove `scala.xml.dtd.ElementValidator`
+- Remove `scala.xml.factory.Binder`
+- Remove `scala.xml.parsing.ValidatingMarkupHandler`

CODE_OF_CONDUCT.md

@@ -0,0 +1,7 @@
+all repositories in these organizations:
+
+* [scala](https://github.com/scala)
+* [scalacenter](https://github.com/scalacenter)
+* [lampepfl](https://github.com/lampepfl)
+
+are covered by the Scala Code of Conduct: https://scala-lang.org/conduct/

CONTRIBUTING.md

@@ -0,0 +1,10 @@
+Contributing
+============
+
+Please see the wiki for the scala-xml contributor guide:
+
+https://github.com/scala/scala-xml/wiki/Contributor-guide
+
+Thank you,
+
+The Scala XML maintainers