From 1adde38da12d01d177bdbadb7e94ab84c73cc6bf Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 3 Jun 2025 22:13:31 +0000 Subject: [PATCH 01/26] Update sbt, scripted-plugin to 1.11.1 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 6520f698..61c9b1cb 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.11.0 +sbt.version=1.11.1 From 7fbb438b165b9cbd8c3f547f8446dae85e1db27b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 6 Jun 2025 06:59:11 +0000 Subject: [PATCH 02/26] Update sbt-scala-module to 3.3.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index bfec069c..39d80f82 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.2.2") +addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.3.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0") From f857246d3410d854dbe434577c75202338657704 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 7 Jun 2025 18:07:03 +0000 Subject: [PATCH 03/26] Update auxlib, clib, javalib, junit-runtime, ... to 0.5.8 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index bfec069c..f43e1e52 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,5 +2,5 @@ addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.2.2") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.7") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") From 3a9e2592329d6d1928b82d90ca5e604694ca1ed8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 10 Jun 2025 02:23:40 +0000 Subject: [PATCH 04/26] Update sbt, scripted-plugin to 1.11.2 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 61c9b1cb..bbb0b608 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.11.1 +sbt.version=1.11.2 From c41183f500457b4c355d0541e98613aaf4b77ee4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 6 Jul 2025 19:22:51 +0000 Subject: [PATCH 05/26] Update sbt, scripted-plugin to 1.11.3 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index bbb0b608..c02c575f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.11.2 +sbt.version=1.11.3 From cb1df112eda81866e7e48d449c4c4c1a854765d2 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 9 Jul 2025 23:45:29 +0000 Subject: [PATCH 06/26] Update commons-lang3 to 3.18.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index a2019981..10f5acef 100644 --- a/build.sbt +++ b/build.sbt @@ -166,7 +166,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform) libraryDependencies += "junit" % "junit" % "4.13.2" % Test, libraryDependencies += "com.github.sbt" % "junit-interface" % "0.13.3" % Test, - libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.17.0" % Test, + libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.18.0" % Test, libraryDependencies += "xerces" % "xercesImpl" % "2.12.2" % Test, libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((3, _)) => From e9a9c718be8b2b82620a96bae35184444da077bb Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 12 Aug 2025 20:02:12 +0000 Subject: [PATCH 07/26] Update sbt, scripted-plugin to 1.11.4 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index c02c575f..489e0a72 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.11.3 +sbt.version=1.11.4 From b02b775a6564ae9e0c36d19885f386f7d432d450 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Aug 2025 06:23:03 +0000 Subject: [PATCH 08/26] Bump actions/checkout from 4 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b0594e67..eeeb10de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: scala: [2.12.x, 2.13.x, 3.x] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 0 - uses: actions/setup-java@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1e5360b8..e326ecc9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 0 - uses: actions/setup-java@v4 From 25447d1985d537be11c3768a68b4f42e786fd612 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Aug 2025 06:39:37 +0000 Subject: [PATCH 09/26] Bump actions/setup-java from 4 to 5 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4 to 5. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-java dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eeeb10de..5ea05218 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v5 with: fetch-depth: 0 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v5 with: distribution: temurin java-version: ${{matrix.java}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e326ecc9..764ad61b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v5 with: fetch-depth: 0 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v5 with: distribution: temurin java-version: 8 From 58e30ddb3914b8c2bcd4925f9ca5b684442e039e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 26 Aug 2025 20:29:10 +0000 Subject: [PATCH 10/26] Update sbt, scripted-plugin to 1.11.5 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 489e0a72..e480c675 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.11.4 +sbt.version=1.11.5 From b7f821e495af804d45f165d6e426fe976e1c0979 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 7 Sep 2025 20:46:10 +0000 Subject: [PATCH 11/26] Update sbt-scalajs, scalajs-compiler, ... to 1.20.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 2d6b8de4..633efb76 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.3.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") From 6b57bec9cf04e40af3fb28516807a944bdecdaf2 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 7 Sep 2025 20:46:12 +0000 Subject: [PATCH 12/26] Update sbt, scripted-plugin to 1.11.6 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e480c675..5e6884d3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.11.5 +sbt.version=1.11.6 From 94eed0f98d9c4e57d194e887ed9e41a9e71730b4 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Sun, 14 Sep 2025 15:18:34 +0900 Subject: [PATCH 13/26] update scala3 repository links --- README.md | 4 ++-- shared/src/main/scala/scala/xml/parsing/MarkupParser.scala | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6cd3fe41..5e743bea 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ scala-xml [![latest release for 3.0](https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-xml_3.svg?label=scala+3)](http://mvnrepository.com/artifact/org.scala-lang.modules/scala-xml_3) ========= -The standard Scala XML library. Please file XML issues here, not at https://github.com/scala/bug/issues or http://github.com/lampepfl/dotty/issues. +The standard Scala XML library. Please file XML issues here, not at https://github.com/scala/bug/issues or http://github.com/scala/scala3/issues. The decoupling of scala-xml from the Scala compiler and standard library is possible because the compiler desugars XML literals in Scala source code into a set of method calls. Alternative implementations of these calls are welcome! @@ -12,7 +12,7 @@ Compiler code that shows the calls needed: [Scala 2.11](https://github.com/scala/scala/blob/2.11.x/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala), [Scala 2.12](https://github.com/scala/scala/blob/2.12.x/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala), [Scala 2.13](https://github.com/scala/scala/blob/2.13.x/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala), - [Scala 3](https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/parsing/xml/SymbolicXMLBuilder.scala). + [Scala 3](https://github.com/scala/scala3/blob/main/compiler/src/dotty/tools/dotc/parsing/xml/SymbolicXMLBuilder.scala). API documentation is available [here](https://javadoc.io/doc/org.scala-lang.modules/scala-xml_2.13/). diff --git a/shared/src/main/scala/scala/xml/parsing/MarkupParser.scala b/shared/src/main/scala/scala/xml/parsing/MarkupParser.scala index 618133a2..688ca342 100755 --- a/shared/src/main/scala/scala/xml/parsing/MarkupParser.scala +++ b/shared/src/main/scala/scala/xml/parsing/MarkupParser.scala @@ -60,7 +60,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests { // See ticket #3720 for motivations. // As for why it's `private[parsing]` rather than merely `private`, see // https://github.com/scala/scala-xml/issues/541 ; the broader access is necessary, - // for now anyway, to work around https://github.com/lampepfl/dotty/issues/13096 + // for now anyway, to work around https://github.com/scala/scala3/issues/13096 private[parsing] class WithLookAhead(underlying: Source) extends Source { private val queue: scala.collection.mutable.Queue[Char] = scala.collection.mutable.Queue[Char]() def lookahead(): BufferedIterator[Char] = { @@ -99,7 +99,7 @@ trait MarkupParser extends MarkupParserCommon with TokenTests { /** holds temporary values of pos */ // Note: if marked as an override, this causes a "...cannot override a mutable variable" error with Scala 3; - // SethTisue noted on Oct 14, 2021 that lampepfl/dotty#13744 should fix it - and it probably did, + // SethTisue noted on Oct 14, 2021 that scala/scala3#13744 should fix it - and it probably did, // but Scala XML still builds against Scala 3 version that has this bug, so this still can not be marked as an override :( var tmppos: Int = _ From 4e558befbef5ac66e16bf23227a2e5d9c29693f1 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 25 Sep 2025 17:52:27 +0000 Subject: [PATCH 14/26] Update commons-lang3 to 3.19.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 10f5acef..14b90336 100644 --- a/build.sbt +++ b/build.sbt @@ -166,7 +166,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform) libraryDependencies += "junit" % "junit" % "4.13.2" % Test, libraryDependencies += "com.github.sbt" % "junit-interface" % "0.13.3" % Test, - libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.18.0" % Test, + libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.19.0" % Test, libraryDependencies += "xerces" % "xercesImpl" % "2.12.2" % Test, libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((3, _)) => From 4414dfc249a446328e201445e1e0a265a3e510bd Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 6 Oct 2025 06:47:46 +0000 Subject: [PATCH 15/26] Update sbt, scripted-plugin to 1.11.7 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 5e6884d3..01a16ed1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.11.6 +sbt.version=1.11.7 From aa5bbccbeb0130f4dc7a1451c4787e259ad43e1f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 13 Oct 2025 19:07:01 +0000 Subject: [PATCH 16/26] Update auxlib, clib, javalib, junit-runtime, ... to 0.5.9 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 633efb76..5d1b5abd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,5 +2,5 @@ addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.3.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.9") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") From c6cbb7b4e5cba13723c8fa8349a94c9815a8dd58 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 7 Oct 2025 19:47:25 +0000 Subject: [PATCH 17/26] Update scala-compiler, scala-library to 2.13.17 --- .circleci/config.yml | 12 ++++++------ build.sbt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 63b364a2..7109e436 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -102,7 +102,7 @@ workflows: - scala_job: name: 2.13.x java_version: jdk8 - scala_version: 2.13.16 + scala_version: 2.13.17 - scala_job: name: 3.x java_version: jdk8 @@ -114,7 +114,7 @@ workflows: - scala_job: name: jdk11_2.13.x java_version: jdk11 - scala_version: 2.13.16 + scala_version: 2.13.17 - scala_job: name: jdk11_3.x java_version: jdk11 @@ -126,7 +126,7 @@ workflows: - scala_job: name: jdk17_2.13.x java_version: jdk17 - scala_version: 2.13.16 + scala_version: 2.13.17 - scala_job: name: jdk17_3.x java_version: jdk17 @@ -138,7 +138,7 @@ workflows: - scala_job: name: jdk21_2.13.x java_version: jdk21 - scala_version: 2.13.16 + scala_version: 2.13.17 - scala_job: name: jdk21_3.x java_version: jdk21 @@ -148,7 +148,7 @@ workflows: scala_version: 2.12.20 - scalajs_job: name: sjs1.0_2.13.x - scala_version: 2.13.16 + scala_version: 2.13.17 - scalajs_job: name: sjs1.0_3.x scala_version: 3.3.6 @@ -157,7 +157,7 @@ workflows: scala_version: 2.12.20 - scalanative_job: name: native0.4_2.13.x - scala_version: 2.13.16 + scala_version: 2.13.17 - scalanative_job: name: native0.4_3.x scala_version: 3.3.6 diff --git a/build.sbt b/build.sbt index 14b90336..bda4df8b 100644 --- a/build.sbt +++ b/build.sbt @@ -37,7 +37,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform) .settings( name := "scala-xml", scalaModuleAutomaticModuleName := Some("scala.xml"), - crossScalaVersions := Seq("2.13.16", "2.12.20", "3.3.6"), + crossScalaVersions := Seq("2.13.17", "2.12.20", "3.3.6"), scalaVersion := "2.12.20", scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match { From b84a5a76467f1299a4275c73a88106d5f82bab9b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 15 Oct 2025 20:33:52 +0000 Subject: [PATCH 18/26] Update scala3-library, ... to 3.3.7 --- .circleci/config.yml | 12 ++++++------ build.sbt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7109e436..ed7b822f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -106,7 +106,7 @@ workflows: - scala_job: name: 3.x java_version: jdk8 - scala_version: 3.3.6 + scala_version: 3.3.7 - scala_job: name: jdk11_2.12.x java_version: jdk11 @@ -118,7 +118,7 @@ workflows: - scala_job: name: jdk11_3.x java_version: jdk11 - scala_version: 3.3.6 + scala_version: 3.3.7 - scala_job: name: jdk17_2.12.x java_version: jdk17 @@ -130,7 +130,7 @@ workflows: - scala_job: name: jdk17_3.x java_version: jdk17 - scala_version: 3.3.6 + scala_version: 3.3.7 - scala_job: name: jdk21_2.12.x java_version: jdk21 @@ -142,7 +142,7 @@ workflows: - scala_job: name: jdk21_3.x java_version: jdk21 - scala_version: 3.3.6 + scala_version: 3.3.7 - scalajs_job: name: sjs1.0_2.12.x scala_version: 2.12.20 @@ -151,7 +151,7 @@ workflows: scala_version: 2.13.17 - scalajs_job: name: sjs1.0_3.x - scala_version: 3.3.6 + scala_version: 3.3.7 - scalanative_job: name: native0.4_2.12.x scala_version: 2.12.20 @@ -160,4 +160,4 @@ workflows: scala_version: 2.13.17 - scalanative_job: name: native0.4_3.x - scala_version: 3.3.6 + scala_version: 3.3.7 diff --git a/build.sbt b/build.sbt index bda4df8b..566683a8 100644 --- a/build.sbt +++ b/build.sbt @@ -37,7 +37,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform) .settings( name := "scala-xml", scalaModuleAutomaticModuleName := Some("scala.xml"), - crossScalaVersions := Seq("2.13.17", "2.12.20", "3.3.6"), + crossScalaVersions := Seq("2.13.17", "2.12.20", "3.3.7"), scalaVersion := "2.12.20", scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match { From b5b20809b0fe39170783854ad7a6d5d8fc8264eb Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 11 Nov 2025 15:59:03 -0600 Subject: [PATCH 19/26] remove redundant dependency (#785) sbt-scala-module brings in sbt-header itself --- project/plugins.sbt | 1 - 1 file changed, 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 5d1b5abd..daa6f005 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,4 +3,3 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.9") -addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") From ecc9082502ca128ebd45f3f66ef7636a63b4072e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 12 Nov 2025 20:25:10 +0000 Subject: [PATCH 20/26] Update sbt-scala-module to 3.4.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index daa6f005..c1bb697f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.3.0") +addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.4.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1") From 01e99502dfc00ab4526905d96004b562524552fa Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 18 Nov 2025 00:41:19 +0000 Subject: [PATCH 21/26] Update commons-lang3 to 3.20.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 566683a8..f21d7384 100644 --- a/build.sbt +++ b/build.sbt @@ -166,7 +166,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform) libraryDependencies += "junit" % "junit" % "4.13.2" % Test, libraryDependencies += "com.github.sbt" % "junit-interface" % "0.13.3" % Test, - libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.19.0" % Test, + libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.20.0" % Test, libraryDependencies += "xerces" % "xercesImpl" % "2.12.2" % Test, libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((3, _)) => From 4e23bfae712a38e303026322757bcb7c3262328f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 04:09:26 +0000 Subject: [PATCH 22/26] Bump actions/checkout from 5 to 6 Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ea05218..727f9917 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: scala: [2.12.x, 2.13.x, 3.x] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: fetch-depth: 0 - uses: actions/setup-java@v5 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 764ad61b..cdef358d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: fetch-depth: 0 - uses: actions/setup-java@v5 From f3340be6ec0360b1850dc7ae85fc12eac959d91d Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Tue, 25 Nov 2025 22:12:52 +0100 Subject: [PATCH 23/26] Call `reset` on reusable `SAXParser` instance (#742) --- jvm/src/test/scala/scala/xml/XMLTest.scala | 5 +++-- shared/src/main/scala/scala/xml/factory/XMLLoader.scala | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/jvm/src/test/scala/scala/xml/XMLTest.scala b/jvm/src/test/scala/scala/xml/XMLTest.scala index 5bad0fb3..4e5dba1a 100644 --- a/jvm/src/test/scala/scala/xml/XMLTest.scala +++ b/jvm/src/test/scala/scala/xml/XMLTest.scala @@ -667,13 +667,14 @@ class XMLTestJVM { @UnitTest def checkThatErrorHandlerIsNotOverwritten(): Unit = { var gotAnError: Boolean = false - XML.reader.setErrorHandler(new org.xml.sax.ErrorHandler { + val reader = XML.reader + reader.setErrorHandler(new org.xml.sax.ErrorHandler { override def warning(e: SAXParseException): Unit = gotAnError = true override def error(e: SAXParseException): Unit = gotAnError = true override def fatalError(e: SAXParseException): Unit = gotAnError = true }) try { - XML.loadString("") + XML.adapter.loadDocument(Source.fromString(""), reader) } catch { case _: org.xml.sax.SAXParseException => } diff --git a/shared/src/main/scala/scala/xml/factory/XMLLoader.scala b/shared/src/main/scala/scala/xml/factory/XMLLoader.scala index 251027c1..356e67a1 100644 --- a/shared/src/main/scala/scala/xml/factory/XMLLoader.scala +++ b/shared/src/main/scala/scala/xml/factory/XMLLoader.scala @@ -45,7 +45,11 @@ trait XMLLoader[T <: Node] { } /* Override this to use a different SAXParser. */ - def parser: SAXParser = parserInstance.get + def parser: SAXParser = { + val p = parserInstance.get + p.reset() + p + } /* Override this to use a different XMLReader. */ def reader: XMLReader = parser.getXMLReader From ec4064a742e881fec93306254e13088bfb3735bf Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Wed, 26 Nov 2025 09:27:52 +0100 Subject: [PATCH 24/26] catch UnsupportedOperationException in sax parser reset --- shared/src/main/scala/scala/xml/factory/XMLLoader.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/src/main/scala/scala/xml/factory/XMLLoader.scala b/shared/src/main/scala/scala/xml/factory/XMLLoader.scala index 356e67a1..068b5cd3 100644 --- a/shared/src/main/scala/scala/xml/factory/XMLLoader.scala +++ b/shared/src/main/scala/scala/xml/factory/XMLLoader.scala @@ -47,7 +47,7 @@ trait XMLLoader[T <: Node] { /* Override this to use a different SAXParser. */ def parser: SAXParser = { val p = parserInstance.get - p.reset() + try { p.reset() } catch { case _: UnsupportedOperationException => } p } From 530125a6dda1a400aff5cda700242c0db6d45411 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 26 Nov 2025 23:39:14 +0000 Subject: [PATCH 25/26] Update scala-compiler, scala-library to 2.13.18 --- .circleci/config.yml | 12 ++++++------ build.sbt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ed7b822f..98479439 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -102,7 +102,7 @@ workflows: - scala_job: name: 2.13.x java_version: jdk8 - scala_version: 2.13.17 + scala_version: 2.13.18 - scala_job: name: 3.x java_version: jdk8 @@ -114,7 +114,7 @@ workflows: - scala_job: name: jdk11_2.13.x java_version: jdk11 - scala_version: 2.13.17 + scala_version: 2.13.18 - scala_job: name: jdk11_3.x java_version: jdk11 @@ -126,7 +126,7 @@ workflows: - scala_job: name: jdk17_2.13.x java_version: jdk17 - scala_version: 2.13.17 + scala_version: 2.13.18 - scala_job: name: jdk17_3.x java_version: jdk17 @@ -138,7 +138,7 @@ workflows: - scala_job: name: jdk21_2.13.x java_version: jdk21 - scala_version: 2.13.17 + scala_version: 2.13.18 - scala_job: name: jdk21_3.x java_version: jdk21 @@ -148,7 +148,7 @@ workflows: scala_version: 2.12.20 - scalajs_job: name: sjs1.0_2.13.x - scala_version: 2.13.17 + scala_version: 2.13.18 - scalajs_job: name: sjs1.0_3.x scala_version: 3.3.7 @@ -157,7 +157,7 @@ workflows: scala_version: 2.12.20 - scalanative_job: name: native0.4_2.13.x - scala_version: 2.13.17 + scala_version: 2.13.18 - scalanative_job: name: native0.4_3.x scala_version: 3.3.7 diff --git a/build.sbt b/build.sbt index f21d7384..d1fd9a4f 100644 --- a/build.sbt +++ b/build.sbt @@ -37,7 +37,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform) .settings( name := "scala-xml", scalaModuleAutomaticModuleName := Some("scala.xml"), - crossScalaVersions := Seq("2.13.17", "2.12.20", "3.3.7"), + crossScalaVersions := Seq("2.13.18", "2.12.20", "3.3.7"), scalaVersion := "2.12.20", scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match { From 2deffada16038651b94fea3b3344ee80968aa026 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 12 Dec 2025 22:34:36 +0000 Subject: [PATCH 26/26] Update scala-compiler, scala-library to 2.12.21 --- .circleci/config.yml | 12 ++++++------ build.sbt | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 98479439..8f3ac680 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -98,7 +98,7 @@ workflows: - scala_job: name: 2.12.x java_version: jdk8 - scala_version: 2.12.20 + scala_version: 2.12.21 - scala_job: name: 2.13.x java_version: jdk8 @@ -110,7 +110,7 @@ workflows: - scala_job: name: jdk11_2.12.x java_version: jdk11 - scala_version: 2.12.20 + scala_version: 2.12.21 - scala_job: name: jdk11_2.13.x java_version: jdk11 @@ -122,7 +122,7 @@ workflows: - scala_job: name: jdk17_2.12.x java_version: jdk17 - scala_version: 2.12.20 + scala_version: 2.12.21 - scala_job: name: jdk17_2.13.x java_version: jdk17 @@ -134,7 +134,7 @@ workflows: - scala_job: name: jdk21_2.12.x java_version: jdk21 - scala_version: 2.12.20 + scala_version: 2.12.21 - scala_job: name: jdk21_2.13.x java_version: jdk21 @@ -145,7 +145,7 @@ workflows: scala_version: 3.3.7 - scalajs_job: name: sjs1.0_2.12.x - scala_version: 2.12.20 + scala_version: 2.12.21 - scalajs_job: name: sjs1.0_2.13.x scala_version: 2.13.18 @@ -154,7 +154,7 @@ workflows: scala_version: 3.3.7 - scalanative_job: name: native0.4_2.12.x - scala_version: 2.12.20 + scala_version: 2.12.21 - scalanative_job: name: native0.4_2.13.x scala_version: 2.13.18 diff --git a/build.sbt b/build.sbt index d1fd9a4f..00b8c209 100644 --- a/build.sbt +++ b/build.sbt @@ -37,8 +37,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform, NativePlatform) .settings( name := "scala-xml", scalaModuleAutomaticModuleName := Some("scala.xml"), - crossScalaVersions := Seq("2.13.18", "2.12.20", "3.3.7"), - scalaVersion := "2.12.20", + crossScalaVersions := Seq("2.13.18", "2.12.21", "3.3.7"), + scalaVersion := "2.12.21", scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((3, _)) =>