From 033661fe8e3ecce6e156eb94e4e16323e9f42d5a Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Wed, 13 Sep 2023 22:54:46 -0400
Subject: [PATCH] Zinc 1.9.4

---
 .github/workflows/ci.yml   | 7 +++----
 project/Dependencies.scala | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index acbf5bf7339..710b3f3552b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -53,7 +53,6 @@ jobs:
       JAVA_OPTS: -Xms800M -Xmx2G -Xss6M -XX:ReservedCodeCacheSize=128M -server -Dsbt.io.virtual=false -Dfile.encoding=UTF-8
       JVM_OPTS: -Xms800M -Xmx2G -Xss6M -XX:ReservedCodeCacheSize=128M -server -Dsbt.io.virtual=false -Dfile.encoding=UTF-8
       SCALA_212: 2.12.18
-      SCALA_213: 2.13.11
       SCALA_3: 3.1.0
       UTIL_TESTS: "utilCache/test utilControl/test utilInterface/test utilLogging/test utilPosition/test utilRelation/test utilScripted/test utilTracking/test"
       SBT_LOCAL: false
@@ -120,7 +119,7 @@ jobs:
         ./sbt -v --client "serverTestProj/test"
         ./sbt -v --client doc
         ./sbt -v --client "all $UTIL_TESTS"
-        ./sbt -v --client ++$SCALA_213
+        ./sbt -v --client ++2.13.x
         ./sbt -v --client "all $UTIL_TESTS"
     - name: Build and test (2)
       if: ${{ matrix.jobtype == 2 }}
@@ -141,7 +140,7 @@ jobs:
       if: ${{ matrix.jobtype == 5 }}
       shell: bash
       run: |
-        ./sbt -v "++$SCALA_213!; test; ++$SCALA_3!; all utilControl/test utilRelation/test utilPosition/test"
+        ./sbt -v "++2.13.x!; test; ++$SCALA_3!; all utilControl/test utilRelation/test utilPosition/test"
     - name: Build and test (6)
       if: ${{ matrix.jobtype == 6 }}
       shell: bash
@@ -153,7 +152,7 @@ jobs:
         cd ../
         sbt -Dsbtlm.path=$HOME/work/sbt/sbt/librarymanagement -Dsbtzinc.path=$HOME/work/sbt/sbt/zinc -Dsbt.build.version=$BUILD_VERSION -Dsbt.build.fatal=false "+lowerUtils/publishLocal; {librarymanagement}/publishLocal; {zinc}/publishLocal; upperModules/publishLocal"
         rm -r $(find $HOME/.sbt/boot -name "*-SNAPSHOT") || true
-        sbt -v -Dsbt.version=$BUILD_VERSION "++$SCALA_213; all $UTIL_TESTS; ++$SCALA_212; all $UTIL_TESTS; scripted actions/* source-dependencies/*1of3 dependency-management/*1of4 java/*"
+        sbt -v -Dsbt.version=$BUILD_VERSION "++2.13.x; all $UTIL_TESTS; ++$SCALA_212; all $UTIL_TESTS; scripted actions/* source-dependencies/*1of3 dependency-management/*1of4 java/*"
     - name: Build and test (7)
       if: ${{ matrix.jobtype == 7 }}
       shell: bash
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 18af509553a..b152ebfebe1 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -5,7 +5,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._
 object Dependencies {
   // WARNING: Please Scala update versions in PluginCross.scala too
   val scala212 = "2.12.18"
-  val scala213 = "2.13.11"
+  val scala213 = "2.13.12"
   val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up")
   val baseScalaVersion = scala212
   def nightlyVersion: Option[String] =
@@ -14,8 +14,8 @@ object Dependencies {
   // sbt modules
   private val ioVersion = nightlyVersion.getOrElse("1.9.1")
   private val lmVersion =
-    sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.9.2")
-  val zincVersion = nightlyVersion.getOrElse("1.9.3")
+    sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.9.3")
+  val zincVersion = nightlyVersion.getOrElse("1.9.4")
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion