Drop util-testing

build.sbt

@@ -66,7 +66,8 @@ lazy val lm = (project in file("librarymanagement"))
     name := "librarymanagement",
     libraryDependencies ++= Seq(
       ivy, jsch, scalaReflect.value, launcherInterface, gigahorseOkhttp, okhttpUrlconnection,
-      sjsonnewScalaJson.value % Optional
+      sjsonnewScalaJson.value % Optional,
+      scalaTest
     ),
     libraryDependencies ++= scalaXml.value,
     resourceGenerators in Compile += Def.task(
@@ -90,7 +91,6 @@ lazy val lm = (project in file("librarymanagement"))
   .configure(
     addSbtIO,
     addSbtUtilLogging,
-    addSbtUtilTesting,
     addSbtUtilCollection,
     addSbtUtilCompletion,
     addSbtUtilCache

librarymanagement/src/test/scala/CrossVersionTest.scala

@@ -1,6 +1,6 @@
 package sbt.librarymanagement
 
-import sbt.internal.util.UnitSpec
+import sbt.internal.librarymanagement.UnitSpec
 import CrossVersion._
 
 class CrossVersionTest extends UnitSpec {

librarymanagement/src/test/scala/DMSerializationSpec.scala

@@ -3,7 +3,7 @@ package sbt.librarymanagement
 import java.net.URL
 import java.io.File
 
-import sbt.internal._, librarymanagement._, util.UnitSpec
+import sbt.internal._, librarymanagement._
 import scalajson.ast.unsafe._
 import sjsonnew._, support.scalajson.unsafe._
 import org.scalatest.Assertion

librarymanagement/src/test/scala/MergeDescriptorSpec.scala

@@ -1,6 +1,6 @@
 package sbt.internal.librarymanagement
 
-import org.apache.ivy.core.module.descriptor.{ DependencyArtifactDescriptor }
+import org.apache.ivy.core.module.descriptor.DependencyArtifactDescriptor
 import sbt.librarymanagement._
 import sbt.internal.librarymanagement.ivyint._
 

librarymanagement/src/test/scala/ModuleIdTest.scala

@@ -1,6 +1,6 @@
 package sbt.librarymanagement
 
-import sbt.internal.util.UnitSpec
+import sbt.internal.librarymanagement.UnitSpec
 
 class ModuleIdTest extends UnitSpec {
   "Module Id" should "return cross-disabled module id as equal to a copy" in {

librarymanagement/src/test/scala/OfflineModeSpec.scala

@@ -3,7 +3,7 @@ package sbt.librarymanagement
 import org.scalatest.Assertion
 import sbt.internal.librarymanagement._
 import sbt.internal.librarymanagement.impl.DependencyBuilders
-import sbt.io.{ FileFilter, IO, Path }
+import sbt.io.IO
 
 class OfflineModeSpec extends BaseIvySpecification with DependencyBuilders {
   private final def targetDir = Some(currentDependency)

librarymanagement/src/test/scala/ResolverTest.scala

@@ -2,7 +2,7 @@ package sbt.librarymanagement
 
 import java.net.URL
 
-import sbt.internal.util.UnitSpec
+import sbt.internal.librarymanagement.UnitSpec
 
 object ResolverTest extends UnitSpec {
 

librarymanagement/src/test/scala/ScalaOverrideTest.scala

@@ -3,7 +3,7 @@ package sbt.librarymanagement
 import org.apache.ivy.core.module.id.ModuleRevisionId
 import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor
 
-import sbt.internal.util.UnitSpec
+import sbt.internal.librarymanagement.UnitSpec
 
 import IvyScala.OverrideScalaMediator
 import ScalaArtifacts._

librarymanagement/src/test/scala/UpdateOptionsSpec.scala

@@ -1,6 +1,6 @@
 package sbt.librarymanagement
 
-import sbt.internal.util.UnitSpec
+import sbt.internal.librarymanagement.UnitSpec
 
 class UpdateOptionsSpec extends UnitSpec {
 

librarymanagement/src/test/scala/VersionNumberSpec.scala

@@ -1,6 +1,6 @@
 package sbt.librarymanagement
 
-import sbt.internal.util.UnitSpec
+import sbt.internal.librarymanagement.UnitSpec
 
 // This is a specification to check the version number parsing.
 class VersionNumberSpec extends UnitSpec {

project/Dependencies.scala

@@ -13,7 +13,6 @@ object Dependencies {
 
   private val utilCollection = "org.scala-sbt" %% "util-collection" % utilVersion
   private val utilLogging = "org.scala-sbt" %% "util-logging" % utilVersion
-  private val utilTesting = "org.scala-sbt" %% "util-testing" % utilVersion
   private val utilCompletion = "org.scala-sbt" %% "util-completion" % utilVersion
   private val utilCache = "org.scala-sbt" %% "util-cache" % utilVersion
 
@@ -28,16 +27,10 @@ object Dependencies {
   lazy val sbtIoPath = getSbtModulePath("sbtio.path", "sbt/io")
   lazy val sbtUtilPath = getSbtModulePath("sbtutil.path", "sbt/util")
 
-  def addSbtModule(p: Project,
+  def addSbtModule(p: Project, path: Option[String], projectName: String, m: ModuleID) =
-                   path: Option[String],
-                   projectName: String,
-                   m: ModuleID,
-                   c: Option[Configuration] = None) =
     path match {
-      case Some(f) =>
+      case Some(f) => p dependsOn ProjectRef(file(f), projectName)
-        p dependsOn c.fold[ClasspathDep[ProjectReference]](ProjectRef(file(f), projectName))(
+      case None    => p settings (libraryDependencies += m)
-          ProjectRef(file(f), projectName) % _)
-      case None => p settings (libraryDependencies += c.fold(m)(m % _))
     }
 
   def addSbtIO(p: Project): Project = addSbtModule(p, sbtIoPath, "io", sbtIO)
@@ -45,8 +38,6 @@ object Dependencies {
     addSbtModule(p, sbtUtilPath, "utilCollection", utilCollection)
   def addSbtUtilLogging(p: Project): Project =
     addSbtModule(p, sbtUtilPath, "utilLogging", utilLogging)
-  def addSbtUtilTesting(p: Project): Project =
-    addSbtModule(p, sbtUtilPath, "utilTesting", utilTesting, Some(Test))
   def addSbtUtilCompletion(p: Project): Project =
     addSbtModule(p, sbtUtilPath, "utilComplete", utilCompletion)
   def addSbtUtilCache(p: Project): Project = addSbtModule(p, sbtUtilPath, "utilCache", utilCache)
@@ -56,6 +47,7 @@ object Dependencies {
   val jsch = "com.jcraft" % "jsch" % "0.1.46" intransitive ()
   val scalaReflect = Def.setting { "org.scala-lang" % "scala-reflect" % scalaVersion.value }
   val scalaXml = scala211Module("scala-xml", "1.0.5")
+  val scalaTest = "org.scalatest" %% "scalatest" % "3.0.1" % Test
   val sjsonnew = Def.setting { "com.eed3si9n" %% "sjson-new-core" % contrabandSjsonNewVersion.value }
   val sjsonnewScalaJson = Def.setting { "com.eed3si9n" %% "sjson-new-scalajson" % contrabandSjsonNewVersion.value }
   val gigahorseOkhttp = "com.eed3si9n" %% "gigahorse-okhttp" % "0.3.0"