From 41d639c0f491a7d951df0754ed659ceceeb46f4b Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Thu, 10 Nov 2022 13:57:54 -0500
Subject: [PATCH] Bump scala-xml and util

---
 build.sbt                                                  | 5 ++++-
 project/Dependencies.scala                                 | 7 ++++---
 .../source-dependencies/trait-trait-212/build.json         | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build.sbt b/build.sbt
index 45bc05cd6..de0c7d97c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -260,7 +260,10 @@ lazy val zincPersist = (projectMatrix in internalPath / "zinc-persist")
   .dependsOn(zincCore, zincCompileCore, zincPersistCoreAssembly, zincCore % "test->test")
   .settings(
     name := "zinc Persist",
-    libraryDependencies += sbinary,
+    libraryDependencies ++= Seq(
+      sbinary.exclude("org.scala-lang.modules", "scala-xml_" + scalaBinaryVersion.value),
+      scalaXml
+    ),
     compileOrder := sbt.CompileOrder.Mixed,
     Compile / scalacOptions ++= (scalaVersion.value match {
       case VersionNumber(Seq(2, 12, _*), _, _) =>
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index fc1697370..bca92c4d3 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -7,14 +7,14 @@ object Dependencies {
 
   val scala210 = "2.10.7"
   val scala211 = "2.11.12"
-  val scala212 = "2.12.16"
+  val scala212 = "2.12.17"
   val scala213 = "2.13.8"
   val defaultScalaVersion = scala212
   val allScalaVersions = Seq(defaultScalaVersion, scala210, scala211, scala213)
   val scala212_213 = Seq(defaultScalaVersion, scala213)
 
-  private val ioVersion = nightlyVersion.getOrElse("1.7.0")
-  private val utilVersion = nightlyVersion.getOrElse("1.7.2")
+  private val ioVersion = nightlyVersion.getOrElse("1.8.0")
+  private val utilVersion = nightlyVersion.getOrElse("1.8.0")
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
 
@@ -72,6 +72,7 @@ object Dependencies {
 
   val parserCombinator = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2"
   val sbinary = "org.scala-sbt" %% "sbinary" % "0.5.1"
+  val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "2.1.0"
   val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.17.0"
   val scalatest = "org.scalatest" %% "scalatest" % "3.2.13"
   val verify = "com.eed3si9n.verify" %% "verify" % "2.0.1"
diff --git a/zinc/src/sbt-test/source-dependencies/trait-trait-212/build.json b/zinc/src/sbt-test/source-dependencies/trait-trait-212/build.json
index c86e24b31..e0b936b8f 100644
--- a/zinc/src/sbt-test/source-dependencies/trait-trait-212/build.json
+++ b/zinc/src/sbt-test/source-dependencies/trait-trait-212/build.json
@@ -2,7 +2,7 @@
   "projects": [
     {
       "name": "mirtest",
-      "scalaVersion": "2.12.16"
+      "scalaVersion": "2.12.17"
     }
   ]
 }