From cb010d6da3c6172c23f60a81cab2a11086f30732 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 11 May 2026 11:02:10 -0400
Subject: [PATCH] Backport ScalaTest bump

---
 build.sbt                   |  6 +++---
 project/Dependencies.scala  | 12 +++++++++++-
 project/NightlyPlugin.scala |  3 +--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/build.sbt b/build.sbt
index f47ac131c..7b1670efa 100644
--- a/build.sbt
+++ b/build.sbt
@@ -840,7 +840,7 @@ lazy val sbtClientProj = (project in file("client"))
     bspEnabled := false,
     crossPaths := false,
     exportJars := true,
-    libraryDependencies += scalatest % Test,
+    libraryDependencies ++= Dependencies.scalatest,
     Compile / mainClass := Some("sbt.client.Client"),
     nativeImageReady := { () =>
       ()
@@ -1172,11 +1172,11 @@ lazy val lmCore = (project in file("lm-core"))
       scalaXml,
       sjsonNewScalaJson.value % Optional,
       sjsonNewCore.value % Optional,
-      scalatest % Test,
       scalacheck % Test,
       scalaVerify % Test,
       hedgehog % Test,
     ),
+    libraryDependencies ++= Dependencies.scalatest,
     Compile / resourceGenerators += Def
       .task(
         Utils.generateVersionFile(
@@ -1230,11 +1230,11 @@ lazy val lmIvy = (project in file("lm-ivy"))
       ivy,
       sjsonNewScalaJson.value,
       sjsonNewCore.value,
-      scalatest % Test,
       scalacheck % Test,
       scalaVerify % Test,
       hedgehog % Test,
     ),
+    libraryDependencies ++= Dependencies.scalatest,
     contrabandSettings,
     Test / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat,
     mimaSettings,
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index a38ce3046..ef4b9baba 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -84,7 +84,17 @@ object Dependencies {
   val jline3Native = "org.jline" % "jline-native" % jline3Version
   val jline3Reader = "org.jline" % "jline-reader" % jline3Version
   val jline3Builtins = "org.jline" % "jline-builtins" % jline3Version
-  val scalatest = "org.scalatest" %% "scalatest" % "3.2.19"
+  val scalatest = Seq(
+    "scalatest-diagrams",
+    "scalatest-flatspec",
+    "scalatest-freespec",
+    "scalatest-funspec",
+    "scalatest-funsuite",
+    "scalatest-propspec",
+    "scalatest-shouldmatchers",
+  ).map(
+    "org.scalatest" %% _ % "3.2.20" % Test
+  )
   val scalacheck = "org.scalacheck" %% "scalacheck" % "1.19.0"
   val junit = "junit" % "junit" % "4.13.2"
   val scalaVerify = "com.eed3si9n.verify" %% "verify" % "1.0.0"
diff --git a/project/NightlyPlugin.scala b/project/NightlyPlugin.scala
index 2a796931e..664ff576a 100644
--- a/project/NightlyPlugin.scala
+++ b/project/NightlyPlugin.scala
@@ -14,10 +14,9 @@ object NightlyPlugin extends AutoPlugin {
         Seq(
           scalacheck % Test,
           junit % Test,
-          scalatest % Test,
           scalaVerify % Test,
           hedgehog % Test
-        )
+        ) ++ scalatest
       else Seq()
     )
   }