Code

merge 1.x onto master#448

Code

Merged

SethTisue merged 38 commits intoscala:masterscala/scala-xml:masterfrom

SethTisue:merge-1.x-to-master-20200915SethTisue/scala-xml:merge-1.x-to-master-20200915Copy head branch name to clipboard

Sep 15, 2020

Commits

Commits on May 16, 2019

• Use 2.13.0-RC2 release candidate

  ashawley

  committed
  59ff6c0

  Copy full SHA for 59ff6c0

Commits on May 29, 2019

• support Scala 2.13.0-RC3 (drop RC2)

  SethTisue

  committed
  23b23dd

  Copy full SHA for 23b23dd

• restore MiMa exemption temporarily

  SethTisue

  committed
  0c53c45

  Copy full SHA for 0c53c45

• Merge pull request #315 from SethTisue/rc3

  Show description for a784ceb
  SethTisue

  authored
  a784ceb

  Copy full SHA for a784ceb

Commits on May 30, 2019

• upgrade 1.x branch to sbt 0.13.18

  SethTisue

  committed
  fb772d5

  Copy full SHA for fb772d5

• Merge pull request #317 from SethTisue/sbt-0.13.18

  Show description for 04d4b06
  SethTisue

  authored
  04d4b06

  Copy full SHA for 04d4b06

Commits on Jun 7, 2019

• Use Scala 2.13.0

  ashawley

  committed
  4abaf7c

  Copy full SHA for 4abaf7c

• Merge pull request #320 from ashawley/1.x-2.13.0

  Show description for 0359b53
  ashawley

  authored
  0359b53

  Copy full SHA for 0359b53

Commits on Jun 18, 2019

• Use openjdk8 in Travis

  ashawley

  committed
  9c0b747

  Copy full SHA for 9c0b747

• Revert openjdk8 since it's not available on Ubuntu 12 precise

  ashawley

  committed
  58f7f6f

  Copy full SHA for 58f7f6f

Commits on Jun 25, 2019

• Fix link to latest release for scala 2.13

  

  Philippus

  authored and

  ashawley

  committed
  fed1d50

  Copy full SHA for fed1d50

• Deprecate scala.xml.persistent

  ashawley

  committed
  273bd64

  Copy full SHA for 273bd64

Commits on Aug 1, 2019

• Merge pull request #330 from ashawley/deprecate-persistent

  Show description for 2bc3bbc
  ashawley

  authored
  2bc3bbc

  Copy full SHA for 2bc3bbc

Commits on Jan 21, 2020

• Use openjdk8 on Travis for 1.x

  ashawley

  committed
  f4f32b4

  Copy full SHA for f4f32b4

• Merge pull request #393 from ashawley/openjdk8-travis

  Show description for 02daeb8
  ashawley

  authored
  02daeb8

  Copy full SHA for 02daeb8

• Deprecate various classes

  ashawley

  committed
  b345ad1

  Copy full SHA for b345ad1

• Add empty Circle config

  ashawley

  committed
  0723a87

  Copy full SHA for 0723a87

• Merge pull request #394 from ashawley/deprecate-etc

  Show description for 961182a
  ashawley

  authored
  961182a

  Copy full SHA for 961182a

• Merge pull request #395 from ashawley/empty-circle

  Show description for a410659
  ashawley

  authored
  a410659

  Copy full SHA for a410659

Commits on Jan 22, 2020

• Fix 2.13 collections methods for NodeSeq

  ashawley

  committed
  bcb83f3

  Copy full SHA for bcb83f3

• Add test of issue 392

  ashawley

  committed
  e723935

  Copy full SHA for e723935

Commits on Jan 31, 2020

• Add further tests of NodeSeq

  ashawley

  committed
  df7d18e

  Copy full SHA for df7d18e

• Merge pull request #396 from ashawley/issue-392

  Show description for 306fe58
  ashawley

  authored
  306fe58

  Copy full SHA for 306fe58

Commits on Feb 6, 2020

• Various updates for 1.3.0

  ashawley

  committed
  a311d74

  Copy full SHA for a311d74

• Merge pull request #411 from ashawley/1.3-update

  Show description for 003f60c
  ashawley

  authored
  003f60c

  Copy full SHA for 003f60c

Commits on Feb 24, 2020

• backport new publishing scripts based on sbt-ci-release

  lrytz

  committed
  5966334

  Copy full SHA for 5966334

Commits on Feb 27, 2020

• Merge pull request #418 from lrytz/publish-backport

  Show description for 172ce22
  lrytz

  authored
  172ce22

  Copy full SHA for 172ce22

Commits on Mar 16, 2020

• Update to Scala.js 1.0.1

  ashawley

  committed
  c60de43

  Copy full SHA for c60de43

Commits on Sep 15, 2020

• Merge commit 'a784ceb8836eaa8460482c943ff228b086466469' into merge-1.x-to-master-20200915

  SethTisue

  committed
  6205001

  Copy full SHA for 6205001

• Merge commit '273bd64ce39cd7425d789019653625b45d30f7e8' into merge-1.x-to-master-20200915

  SethTisue

  committed
  e2a3c3c

  Copy full SHA for e2a3c3c

• Merge commit '003f60cd776975c05a58628297714364314f01df' into merge-1.x-to-master-20200915

  SethTisue

  committed
  43d3ebf

  Copy full SHA for 43d3ebf

• bump Scala, sbt, Scala.js versions

  SethTisue

  committed
  57353cd

  Copy full SHA for 57353cd

• Merge pull request #447 from SethTisue/version-bumps-1.x

  Show description for a2d6d9a
  SethTisue

  authored
  a2d6d9a

  Copy full SHA for a2d6d9a

• Merge commit '172ce22ca19a21cd3e4e9e7b5fad2f8b14819cf4' into merge-1.x-to-master-20200915

  SethTisue

  committed
  a63681b

  Copy full SHA for a63681b

• Merge remote-tracking branch 'origin/1.x' into merge-1.x-to-master-20200915

  SethTisue

  committed
  a1fb5d6

  Copy full SHA for a1fb5d6

• Merge remote-tracking branch 'origin/master' into merge-1.x-to-master-20200915

  SethTisue

  committed
  89fed18

  Copy full SHA for 89fed18

• fix bad merge

  SethTisue

  committed
  7f35af5

  Copy full SHA for 7f35af5

• fix up version numbers in CircleCI config

  SethTisue

  committed
  d2e5e84

  Copy full SHA for d2e5e84