From 85cfe4d78cbbe2c1e31842bb097b1f92dd2e8c3b Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Wed, 21 Jun 2017 13:59:31 +0100 Subject: [PATCH] Drop util-testing --- build.sbt | 4 ++-- .../src/test/scala/CrossVersionTest.scala | 2 +- .../src/test/scala/DMSerializationSpec.scala | 2 +- .../src/test/scala/MergeDescriptorSpec.scala | 2 +- .../src/test/scala/ModuleIdTest.scala | 2 +- .../src/test/scala/OfflineModeSpec.scala | 2 +- .../src/test/scala/ResolverTest.scala | 2 +- .../src/test/scala/ScalaOverrideTest.scala | 2 +- .../src/test/scala/UpdateOptionsSpec.scala | 2 +- .../src/test/scala/VersionNumberSpec.scala | 2 +- project/Dependencies.scala | 16 ++++------------ 11 files changed, 15 insertions(+), 23 deletions(-) diff --git a/build.sbt b/build.sbt index c4a7dd5b3..0251916d7 100644 --- a/build.sbt +++ b/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 diff --git a/librarymanagement/src/test/scala/CrossVersionTest.scala b/librarymanagement/src/test/scala/CrossVersionTest.scala index 376a17cb1..b2c52a732 100644 --- a/librarymanagement/src/test/scala/CrossVersionTest.scala +++ b/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 { diff --git a/librarymanagement/src/test/scala/DMSerializationSpec.scala b/librarymanagement/src/test/scala/DMSerializationSpec.scala index 06c178d8e..35c0f7c01 100644 --- a/librarymanagement/src/test/scala/DMSerializationSpec.scala +++ b/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 diff --git a/librarymanagement/src/test/scala/MergeDescriptorSpec.scala b/librarymanagement/src/test/scala/MergeDescriptorSpec.scala index dddeadfdd..b435027bd 100644 --- a/librarymanagement/src/test/scala/MergeDescriptorSpec.scala +++ b/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._ diff --git a/librarymanagement/src/test/scala/ModuleIdTest.scala b/librarymanagement/src/test/scala/ModuleIdTest.scala index 8b1d7d7b7..a9bab61f0 100644 --- a/librarymanagement/src/test/scala/ModuleIdTest.scala +++ b/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 { diff --git a/librarymanagement/src/test/scala/OfflineModeSpec.scala b/librarymanagement/src/test/scala/OfflineModeSpec.scala index ea6b5f1d7..04d8cf836 100644 --- a/librarymanagement/src/test/scala/OfflineModeSpec.scala +++ b/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) diff --git a/librarymanagement/src/test/scala/ResolverTest.scala b/librarymanagement/src/test/scala/ResolverTest.scala index 2682797fa..d98eab799 100644 --- a/librarymanagement/src/test/scala/ResolverTest.scala +++ b/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 { diff --git a/librarymanagement/src/test/scala/ScalaOverrideTest.scala b/librarymanagement/src/test/scala/ScalaOverrideTest.scala index 2417db786..bb872438d 100644 --- a/librarymanagement/src/test/scala/ScalaOverrideTest.scala +++ b/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._ diff --git a/librarymanagement/src/test/scala/UpdateOptionsSpec.scala b/librarymanagement/src/test/scala/UpdateOptionsSpec.scala index 8a152bb13..eaf61fe29 100644 --- a/librarymanagement/src/test/scala/UpdateOptionsSpec.scala +++ b/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 { diff --git a/librarymanagement/src/test/scala/VersionNumberSpec.scala b/librarymanagement/src/test/scala/VersionNumberSpec.scala index 66fd96f61..5a1c27a7a 100644 --- a/librarymanagement/src/test/scala/VersionNumberSpec.scala +++ b/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 { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8567c1012..156539ddd 100644 --- a/project/Dependencies.scala +++ b/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, - path: Option[String], - projectName: String, - m: ModuleID, - c: Option[Configuration] = None) = + def addSbtModule(p: Project, path: Option[String], projectName: String, m: ModuleID) = path match { - case Some(f) => - p dependsOn c.fold[ClasspathDep[ProjectReference]](ProjectRef(file(f), projectName))( - ProjectRef(file(f), projectName) % _) - case None => p settings (libraryDependencies += c.fold(m)(m % _)) + case Some(f) => p dependsOn ProjectRef(file(f), projectName) + case None => p settings (libraryDependencies += 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"