This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil.git
The following commit(s) were added to refs/heads/main by this push:
new 522270948 Update scala-xml to 2.4.0
522270948 is described below
commit 5222709483c43cc44e5ee2a6e49f710aa72c0a26
Author: Scala Steward <[email protected]>
AuthorDate: Tue Sep 2 15:24:34 2025 -0400
Update scala-xml to 2.4.0
Also remove some calls to .toSeq, made unecessary by recent changes to
scala-xm
---
.../src/main/scala/org/apache/daffodil/core/dsom/SequenceGroup.scala | 2 +-
.../src/main/scala/org/apache/daffodil/core/dsom/SimpleTypes.scala | 4 ++--
project/Dependencies.scala | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SequenceGroup.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SequenceGroup.scala
index 34588cd08..aa143c092 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SequenceGroup.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SequenceGroup.scala
@@ -276,7 +276,7 @@ trait SequenceDefMixin
protected def emptyFormatFactory = new
DFDLSequence(newDFDLAnnotationXML("sequence"), this)
- final lazy val apparentXMLChildren = (xml \\ "sequence").head.child.toSeq
+ final lazy val apparentXMLChildren = (xml \\ "sequence").head.child
def xmlChildren: Seq[Node] = apparentXMLChildren
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SimpleTypes.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SimpleTypes.scala
index f0a3a728f..1e14bf7e6 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SimpleTypes.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SimpleTypes.scala
@@ -277,7 +277,7 @@ final class EnumerationDef(xml: Node, parentType:
SimpleTypeDefBase)
lazy val repValuesRaw: Seq[String] = {
val optNodes = xml.attribute(XMLUtils.DFDLX_NAMESPACE, "repValues")
- val res = optNodes.map(_.toSeq).getOrElse(Seq.empty).flatMap { node =>
+ val res = optNodes.getOrElse(Seq.empty).flatMap { node =>
RepValueCooker.convertConstant(node.text, this, false)
}
res
@@ -285,7 +285,7 @@ final class EnumerationDef(xml: Node, parentType:
SimpleTypeDefBase)
lazy val repValueRangesRaw: Seq[String] = {
val optNodes = xml.attribute(XMLUtils.DFDLX_NAMESPACE, "repValueRanges")
- val res = optNodes.map(_.toSeq).getOrElse(Seq.empty).flatMap { node =>
+ val res = optNodes.getOrElse(Seq.empty).flatMap { node =>
val ranges = RepValueCooker.convertConstant(node.text, this, false)
if (ranges.length % 2 != 0) {
SDE("dfdlx:repValueRanges must specify an even number of values")
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 929321903..fd6d1e917 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -23,7 +23,7 @@ object Dependencies {
lazy val core = Seq(
"com.lihaoyi" %% "os-lib" % "0.11.4", // for writing/compiling C source
files
- "org.scala-lang.modules" %% "scala-xml" % "2.3.0",
+ "org.scala-lang.modules" %% "scala-xml" % "2.4.0",
"org.scala-lang.modules" %% "scala-parser-combinators" % "2.4.0",
"com.ibm.icu" % "icu4j" % "77.1",
"xerces" % "xercesImpl" % "2.12.2",
