Skip to content

Commit 0aab600

Browse files
SethTisueSethTisue
committed
Merge remote-tracking branch 'origin/master' into threadlocal-parser
2 parents d810bbf + d360cb6 commit 0aab600

File tree

135 files changed

+3182
-2428
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+3182
-2428
lines changed

‎.circleci/config.yml

+180
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
version: 2.1
2+
3+
executors:
4+
scala_jdk8_executor:
5+
docker:
6+
- image: circleci/openjdk:8-jdk-node
7+
scala_jdk11_executor:
8+
docker:
9+
- image: circleci/openjdk:11-jdk
10+
scala_jdk15_executor:
11+
docker:
12+
- image: circleci/openjdk:15-buster
13+
scala_jdk16_executor:
14+
docker:
15+
- image: circleci/openjdk:16-buster
16+
scala_native_executor:
17+
machine:
18+
image: ubuntu-1604:202004-01
19+
20+
commands:
21+
sbt_cmd:
22+
description: "Build with sbt"
23+
parameters:
24+
scala_version:
25+
type: string
26+
default: 2.12.13
27+
sbt_tasks:
28+
type: string
29+
default: update compile test:compile test doc package osgiBundle
30+
steps:
31+
- restore_cache:
32+
keys:
33+
- sbt-deps-v1-{{ checksum "build.sbt" }}
34+
- sbt-deps-v1-
35+
- run: sbt ++<< parameters.scala_version >> << parameters.sbt_tasks >>
36+
- save_cache:
37+
key: sbt-deps-v1-{{ checksum "build.sbt" }}
38+
paths:
39+
- "~/.cache/coursier"
40+
- "~/.ivy2/cache"
41+
- "~/.sbt"
42+
- "~/.m2"
43+
44+
jobs:
45+
scala_job:
46+
executor: scala_<<parameters.java_version>>_executor
47+
parameters:
48+
scala_version:
49+
description: "Scala version"
50+
default: 2.12.13
51+
type: string
52+
java_version:
53+
description: "Java version"
54+
default: jdk8
55+
type: string
56+
steps:
57+
- checkout
58+
- run: java -version
59+
- sbt_cmd:
60+
scala_version: << parameters.scala_version >>
61+
sbt_tasks: xml/update xml/compile xml/test:compile xml/test xml/doc xml/package xml/osgiBundle
62+
scalajs_job:
63+
executor: scala_jdk8_executor
64+
parameters:
65+
scala_version:
66+
description: "Scala version"
67+
default: 2.12.13
68+
type: string
69+
scalajs_version:
70+
description: "ScalaJS version"
71+
default: 1.1.1
72+
type: string
73+
environment:
74+
SCALAJS_VERSION: << parameters.scalajs_version >>
75+
steps:
76+
- checkout
77+
- run: java -version
78+
- run: node -v
79+
- sbt_cmd:
80+
scala_version: << parameters.scala_version >>
81+
sbt_tasks: xmlJS/update xmlJS/compile xmlJS/test:compile xmlJS/test xmlJS/doc xmlJS/package
82+
scalanative_job:
83+
executor: scala_native_executor
84+
parameters:
85+
scala_version:
86+
description: "Scala version"
87+
default: 2.12.13
88+
type: string
89+
scalanative_version:
90+
description: "Scala Native version"
91+
default: 0.4.0
92+
type: string
93+
environment:
94+
SCALANATIVE_VERSION: << parameters.scalanative_version >>
95+
steps:
96+
- checkout
97+
- run:
98+
name: Install dependencies
99+
command: |
100+
echo "deb https://dl.bintray.com/sbt/debian /" | sudo tee -a /etc/apt/sources.list.d/sbt.list
101+
curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | sudo apt-key add
102+
sudo apt-get update
103+
sudo apt-get install -y sbt clang-8 openjdk-8-jdk
104+
sudo ln -s /usr/lib/llvm-8/bin/clang /usr/bin/clang
105+
sudo ln -s /usr/lib/llvm-8/bin/clang++ /usr/bin/clang++
106+
- sbt_cmd:
107+
scala_version: << parameters.scala_version >>
108+
sbt_tasks: xmlNative/update xmlNative/compile xmlNative/test:compile xmlNative/test xmlNative/doc xmlNative/package
109+
110+
workflows:
111+
build:
112+
jobs:
113+
- scala_job:
114+
name: 2.12.13
115+
java_version: jdk8
116+
scala_version: 2.12.13
117+
- scala_job:
118+
name: 2.13.5
119+
java_version: jdk8
120+
scala_version: 2.13.5
121+
- scala_job:
122+
name: 3.0.0-RC1
123+
java_version: jdk8
124+
scala_version: 3.0.0-RC1
125+
- scala_job:
126+
name: 3.0.0-M3
127+
java_version: jdk8
128+
scala_version: 3.0.0-M3
129+
- scala_job:
130+
name: jdk11_2.12
131+
java_version: jdk11
132+
scala_version: 2.12.13
133+
- scala_job:
134+
name: jdk11_2.13
135+
java_version: jdk11
136+
scala_version: 2.13.5
137+
- scala_job:
138+
name: jdk11_3.0
139+
java_version: jdk11
140+
scala_version: 3.0.0-RC1
141+
- scala_job:
142+
name: jdk15_2.12
143+
java_version: jdk15
144+
scala_version: 2.12.13
145+
- scala_job:
146+
name: jdk15_2.13
147+
java_version: jdk15
148+
scala_version: 2.13.5
149+
- scala_job:
150+
name: jdk15_3.0
151+
java_version: jdk15
152+
scala_version: 3.0.0-RC1
153+
- scala_job:
154+
name: jdk16_2.12
155+
java_version: jdk16
156+
scala_version: 2.12.13
157+
- scala_job:
158+
name: jdk16_2.13
159+
java_version: jdk16
160+
scala_version: 2.13.5
161+
- scala_job:
162+
name: jdk16_3.0
163+
java_version: jdk16
164+
scala_version: 3.0.0-RC1
165+
- scalajs_job:
166+
name: sjs1.0_2.12
167+
scala_version: 2.12.13
168+
scalajs_version: 1.5.0
169+
- scalajs_job:
170+
name: sjs1.0_2.13
171+
scala_version: 2.13.5
172+
scalajs_version: 1.5.0
173+
- scalanative_job:
174+
name: native0.4_2.12
175+
scala_version: 2.12.13
176+
scalanative_version: 0.4.0
177+
- scalanative_job:
178+
name: native0.4_2.13
179+
scala_version: 2.13.5
180+
scalanative_version: 0.4.0

‎.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
*.jar
1313
*~
1414

15-
build.properties
16-
1715
# target directories for ant build
1816
/build/
1917
/dists/

‎.scalafmt.conf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
version = "2.7.4"

‎.travis.yml

+23-29
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,30 @@
1-
# opt-in to Travis's newer/faster container-based infrastructure
2-
sudo: false
1+
version: ~> 1.0 # needed for imports
32

4-
language: scala
3+
import: scala/scala-dev:travis/default.yml
54

6-
env:
7-
global:
8-
# PGP_PASSPHRASE
9-
- secure: "BYC1kEnHjNrINrHYWPGEuTTJ2V340/0ByzqeihLecjoZ75yrjWdsh6MI1JEUWgv5kb+58vLzib21JfnjsPK6Yb2bSXuCFCsEtJNh6RJKgxkWlCOzfTSh5I2wl7PCjRClRL6gseX2uTSvFjL4Z//pmxwxeXlLp7voQe4QAUq1+sE="
10-
# SONA_USER
11-
- secure: "OpBwPc1GNvauageYOH3RscAa7wpZxgpmqDz15aigIKLNWzAhAtVUx0MleZ8rQeoqml6nrAvlnzuVHjKL2lVcjMPpjUis7bcQ5UAGK7tZK8x+qZNQxXmpXu8+pENwQA2yFaqt/xy7K5jFOrHJHTRxcPnyVG1yKakPWz53PPYUwbc="
12-
# SONA_PASS
13-
- secure: "Xw7rI/qlML1nD2e2XwlakkhKAWNGZKqqE+Q3ntTvFpfHryl7KLCvVzJ4LIavnL6kGJaWOgy9vlSoEWn5g9nqHSfE31C/k5pY5nTMAKiwiJzfAS+r0asKXW2gmKhwtcTBkqyLVOZLCJSPVlFRQyfBJHY+Fs0L3KWcnMQgtBlyDhU="
5+
language: scala
146

15-
script: admin/build.sh
7+
scala:
8+
- 3.0.0-RC1
9+
- 3.0.0-M3
10+
- 2.12.13
11+
- 2.13.5
1612

17-
addons:
18-
apt:
19-
packages:
20-
- openjdk-6-jdk
13+
env:
14+
- SCALAJS_VERSION= ADOPTOPENJDK=8
15+
- SCALAJS_VERSION=1.5.0 ADOPTOPENJDK=8
16+
- SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
17+
- SCALAJS_VERSION= ADOPTOPENJDK=11
18+
- SCALAJS_VERSION= ADOPTOPENJDK=15
2119

22-
jdk:
23-
- openjdk6
24-
- oraclejdk8
20+
jobs:
21+
exclude:
22+
- scala: 3.0.0-M3
23+
env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
24+
- scala: 3.0.0-RC1
25+
env: SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8
2526

26-
notifications:
27-
email: [email protected]
27+
install:
28+
- git fetch --tags # get all tags for sbt-dynver
2829

29-
before_cache:
30-
- find $HOME/.sbt -name "*.lock" | xargs rm
31-
- find $HOME/.ivy2/cache -name "ivydata-*.properties" | xargs rm
32-
cache:
33-
directories:
34-
- $HOME/.ivy2/cache
35-
- $HOME/.sbt/boot
36-
- $HOME/.sbt/launchers
30+
script: ./build.sh

‎CHANGELOG.md

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# Scala XML Changes
2+
3+
## 2.0.0-M2 (2020-09-15)
4+
5+
Published for Scala 2.12 and 2.13, Scala.js 1.2.0,
6+
and Dotty 0.27.0-RC1.
7+
8+
### Removed
9+
10+
- Removed `scala.xml.dtd.ElementValidator`
11+
12+
## 2.0.0-M1 (2019-10-21)
13+
14+
Not binary compatible with Scala XML 1.2.0.
15+
16+
Published for Scala 2.12, 2.13 and Scala.js 0.6, 1.0.0-M8.
17+
Artifacts are no longer published for Scala 2.11.
18+
19+
Some deprecated elements have been removed; see the "[Removed](#Removed)" section below.
20+
21+
### Added
22+
23+
- The `apiURL` is now published in ivy metadata so that hyperlinks
24+
exist in downstream projects that reference Scala XML in their
25+
Scaladocs.
26+
27+
### Changed
28+
29+
- Changed use of `scala.collection.mutable.Stack` in `FactoryAdapter` to a
30+
`scala.collection.immutable.List`. These members were affected.
31+
- `attribStack`
32+
- `hStack`
33+
- `tagStack`
34+
- `scopeStack`
35+
- The abstract class `FactoryAdapter`, see above, is used elsewhere
36+
within the library, as well, so the previous changes are also
37+
inherited by:
38+
- `scala.xml.parsing.NoBindingFactoryAdapter` implemented class
39+
- `scala.xml.factory.XMLLoader.adapter` static member
40+
41+
### Fixed
42+
43+
- Attribute order is preserved for XML elements, not reversed.
44+
- Don't escape quotes in `scala.xml.PCData` and `CDATA` as an XML `&quot;`
45+
46+
### Removed
47+
48+
Most of these deletions are of vestigial code that is either unused,
49+
of poor quality or both. Very few users of Scala XML will even notice
50+
the removed parts. Most users will not be affected.
51+
52+
The deletions represent about one thousand lines of code (sloc). By
53+
comparison Scala XML is 10,000 sloc, so this is about 10% reduction in
54+
sloc. The code that supports XML literals is maintained upstream in
55+
the Scala compiler, not in the Scala XML library.
56+
57+
- Remove deprecated `scala.xml.pull.XMLEventReader`
58+
- Remove deprecated versions of `scala.xml.Elem` constructors
59+
- Remove deprecated `scala.xml.Elem.xmlToProcess` and
60+
`scala.xml.Elem.processXml`
61+
- Remove deprecated definitions under `scala.xml.persistent`
62+
- `CachedFileStorage`
63+
- `Index`
64+
- `SetStorage`
65+
- Remove `scala.xml.dtd.impl.PointedHedgeExp`
66+
- Remove `scala.xml.dtd.Scanner`
67+
- Remove `scala.xml.dtd.ContentModelParser`
68+
- Remove `scala.xml.dtd.ElementValidator`
69+
- Remove `scala.xml.factory.Binder`
70+
- Remove `scala.xml.parsing.ValidatingMarkupHandler`

‎CODE_OF_CONDUCT.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
all repositories in these organizations:
2+
3+
* [scala](https://github.com/scala)
4+
* [scalacenter](https://github.com/scalacenter)
5+
* [lampepfl](https://github.com/lampepfl)
6+
7+
are covered by the Scala Code of Conduct: https://scala-lang.org/conduct/

‎CONTRIBUTING.md

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Contributing
2+
============
3+
4+
Please see the wiki for the scala-xml contributor guide:
5+
6+
https://github.com/scala/scala-xml/wiki/Contributor-guide
7+
8+
Thank you,
9+
10+
The Scala XML maintainers

0 commit comments

Comments
 (0)