Merge branch '2.13.x' into update/commons-text-1.12.0

SethTisue · web-flow · commit 75aa06e32f80 · 2024-05-20T18:21:39.000-05:00
diff --git a/build.sbt b/build.sbt
@@ -6,6 +6,6 @@ scalacOptions ++= Seq("-feature", "-deprecation", "-Werror", "-source:future")
 libraryDependencies ++= Seq(
   "org.pegdown" % "pegdown" % "1.6.0",
   "org.apache.commons" % "commons-text" % "1.12.0",
-  "org.scala-lang.modules" %% "scala-xml" % "2.2.0",
+  "org.scala-lang.modules" %% "scala-xml" % "2.3.0",
   "org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.4",
 )
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.9
+sbt.version=1.10.0

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ scalacOptions ++= Seq("-feature", "-deprecation", "-Werror", "-source:future")`
`6`	`6`	`libraryDependencies ++= Seq(`
`7`	`7`	`"org.pegdown" % "pegdown" % "1.6.0",`
`8`	`8`	`"org.apache.commons" % "commons-text" % "1.12.0",`
`9`		`- "org.scala-lang.modules" %% "scala-xml" % "2.2.0",`
	`9`	`+ "org.scala-lang.modules" %% "scala-xml" % "2.3.0",`
`10`	`10`	`"org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.4",`
`11`	`11`	`)`