Kill utilTesting

No need for a 1-line, 1-class jar

build.sbt

@@ -48,7 +48,6 @@ lazy val utilRoot: Project = (project in file("."))
     utilRelation,
     utilCache,
     utilTracking,
-    utilTesting,
     utilScripted
   )
   .settings(
@@ -94,25 +93,24 @@ lazy val utilControl = (project in internalPath / "util-control").settings(
 )
 
 val utilPosition = (project in file("internal") / "util-position")
-  .dependsOn(utilTesting % Test)
   .settings(
     commonSettings,
     name := "Util Position",
     scalacOptions += "-language:experimental.macros",
-    libraryDependencies += scalaReflect.value,
+    libraryDependencies ++= Seq(scalaReflect.value, scalaTest),
     mimaSettings,
   )
 
-// logging
 lazy val utilLogging = (project in internalPath / "util-logging")
   .enablePlugins(ContrabandPlugin, JsonCodecPlugin)
-  .dependsOn(utilInterface, utilTesting % Test)
+  .dependsOn(utilInterface)
   .settings(
     commonSettings,
     crossScalaVersions := Seq(scala210, scala211, scala212),
     name := "Util Logging",
     libraryDependencies ++=
       Seq(jline, log4jApi, log4jCore, disruptor, sjsonnewScalaJson.value, scalaReflect.value),
+    libraryDependencies ++= Seq(scalaCheck, scalaTest),
     sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",
     contrabandFormatsForType in generateContrabands in Compile := { tpe =>
       val old = (contrabandFormatsForType in generateContrabands in Compile).value
@@ -122,45 +120,35 @@ lazy val utilLogging = (project in internalPath / "util-logging")
     },
     mimaSettings,
   )
+  .configure(addSbtIO)
 
-// Relation
 lazy val utilRelation = (project in internalPath / "util-relation")
-  .dependsOn(utilTesting % Test)
   .settings(
     commonSettings,
     name := "Util Relation",
+    libraryDependencies ++= Seq(scalaCheck),
     mimaSettings,
   )
 
 // Persisted caching based on sjson-new
 lazy val utilCache = (project in file("util-cache"))
-  .dependsOn(utilTesting % Test)
   .settings(
     commonSettings,
     name := "Util Cache",
     libraryDependencies ++=
       Seq(sjsonnewScalaJson.value, sjsonnewMurmurhash.value, scalaReflect.value),
+    libraryDependencies ++= Seq(scalaTest),
     mimaSettings,
   )
   .configure(addSbtIO)
 
 // Builds on cache to provide caching for filesystem-related operations
 lazy val utilTracking = (project in file("util-tracking"))
-  .dependsOn(utilCache, utilTesting % Test)
+  .dependsOn(utilCache)
   .settings(
     commonSettings,
     name := "Util Tracking",
-    mimaSettings,
+    libraryDependencies ++= Seq(scalaTest),
-  )
-  .configure(addSbtIO)
-
-// Internal utility for testing
-lazy val utilTesting = (project in internalPath / "util-testing")
-  .settings(
-    commonSettings,
-    crossScalaVersions := Seq(scala210, scala211, scala212),
-    name := "Util Testing",
-    libraryDependencies ++= Seq(scalaCheck, scalatest),
     mimaSettings,
   )
   .configure(addSbtIO)

internal/util-testing/src/main/scala/sbt/internal/util/UnitSpec.scala

@@ -1,5 +0,0 @@
-package sbt.internal.util
-
-import org.scalatest._
-
-abstract class UnitSpec extends FlatSpec with Matchers

project/Dependencies.scala

@@ -40,8 +40,9 @@ object Dependencies {
   val scalaCompiler = Def.setting { "org.scala-lang" % "scala-compiler" % scalaVersion.value }
   val scalaReflect = Def.setting { "org.scala-lang" % "scala-reflect" % scalaVersion.value }
 
-  val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.13.4"
+  val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.13.4" % Test
-  val scalatest = "org.scalatest" %% "scalatest" % "3.0.1"
+  val scalaTest  = "org.scalatest"  %% "scalatest"  % "3.0.1"  % Test
+
   val parserCombinator211 = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4"
 
   val sjsonnew = Def.setting {

util-cache/src/test/scala/CacheSpec.scala

@@ -9,9 +9,9 @@ import sjsonnew.IsoString
 import sjsonnew.support.scalajson.unsafe.{ CompactPrinter, Converter, Parser }
 
 import sjsonnew.shaded.scalajson.ast.unsafe.JValue
-import sbt.internal.util.UnitSpec
+import org.scalatest.FlatSpec
 
-class CacheSpec extends UnitSpec {
+class CacheSpec extends FlatSpec {
 
   implicit val isoString: IsoString[JValue] =
     IsoString.iso(CompactPrinter.apply, Parser.parseUnsafe)

util-cache/src/test/scala/FileInfoSpec.scala

@@ -2,10 +2,10 @@ package sbt.util
 
 import sjsonnew.shaded.scalajson.ast.unsafe._
 import sjsonnew._, support.scalajson.unsafe._
-import sbt.internal.util.UnitSpec
+import org.scalatest.FlatSpec
 import sbt.io.IO
 
-class FileInfoSpec extends UnitSpec {
+class FileInfoSpec extends FlatSpec {
   val file = new java.io.File(".").getAbsoluteFile
   val fileInfo: ModifiedFileInfo = FileModified(file, IO.getModifiedTimeOrZero(file))
   val filesInfo = FilesInfo(Set(fileInfo))

util-cache/src/test/scala/SingletonCacheSpec.scala

@@ -9,9 +9,9 @@ import sjsonnew.{ Builder, deserializationError, IsoString, JsonFormat, Unbuilde
 import sjsonnew.support.scalajson.unsafe.{ CompactPrinter, Converter, Parser }
 
 import sjsonnew.shaded.scalajson.ast.unsafe.JValue
-import sbt.internal.util.UnitSpec
+import org.scalatest.FlatSpec
 
-class SingletonCacheSpec extends UnitSpec {
+class SingletonCacheSpec extends FlatSpec {
 
   case class ComplexType(val x: Int, y: String, z: List[Int])
   object ComplexType {

util-tracking/src/test/scala/sbt/util/TrackedSpec.scala

@@ -6,9 +6,9 @@ import sbt.io.syntax._
 import CacheImplicits._
 
 import sjsonnew.IsoString
-import sbt.internal.util.UnitSpec
+import org.scalatest.FlatSpec
 
-class TrackedSpec extends UnitSpec {
+class TrackedSpec extends FlatSpec {
   "lastOutput" should "store the last output" in {
     withStore { store =>
       val value = 5