Merge pull request #122 from dwijnand/detangle

Detangle the dependencies
sbt · Jul 6, 2017 · 74d8a38 · 74d8a38
2 parents 4074e28 + e3891c8
commit 74d8a38
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 352 deletions.
diff --git a/build.sbt b/build.sbt
@@ -37,8 +37,9 @@ lazy val lmRoot = (project in file("."))
       Seq(
         homepage := Some(url("https://github.com/sbt/librarymanagement")),
         description := "Library management module for sbt",
-        scmInfo := Some(ScmInfo(url("https://github.com/sbt/librarymanagement"),
-                                "git@github.com:sbt/librarymanagement.git")),
+        scmInfo := Some(ScmInfo(
+          url("https://github.com/sbt/librarymanagement"), "git@github.com:sbt/librarymanagement.git"
+        )),
         bintrayPackage := "librarymanagement",
         scalafmtOnCompile := true,
         // scalafmtVersion 1.0.0-RC3 has regression
@@ -63,21 +64,17 @@ lazy val lm = (project in file("librarymanagement"))
   .settings(
     commonSettings,
     name := "librarymanagement",
-    libraryDependencies ++= Seq(ivy,
-                                jsch,
-                                scalaReflect.value,
-                                launcherInterface,
-                                gigahorseOkhttp,
-                                okhttpUrlconnection,
-                                sjsonnewScalaJson.value % Optional),
+    libraryDependencies ++= Seq(
+      ivy, jsch, scalaReflect.value, launcherInterface, gigahorseOkhttp, okhttpUrlconnection,
+      sjsonnewScalaJson.value % Optional,
+      scalaTest
+    ),
     libraryDependencies ++= scalaXml.value,
-    resourceGenerators in Compile += Def
-      .task(
-        Util.generateVersionFile(version.value,
-                                 resourceManaged.value,
-                                 streams.value,
-                                 (compile in Compile).value))
-      .taskValue,
+    resourceGenerators in Compile += Def.task(
+      Util.generateVersionFile(
+        version.value, resourceManaged.value, streams.value, (compile in Compile).value
+      )
+    ).taskValue,
     // mimaBinaryIssueFilters ++= Seq(),
     managedSourceDirectories in Compile +=
       baseDirectory.value / "src" / "main" / "contraband-scala",
@@ -91,19 +88,14 @@ lazy val lm = (project in file("librarymanagement"))
       (((srcs --- sdirs --- base) pair (relativeTo(sdirs) | relativeTo(base) | flat)) toSeq)
     }
   )
-  .configure(addSbtIO,
-             addSbtUtilLogging,
-             addSbtUtilTesting,
-             addSbtUtilCollection,
-             addSbtUtilCompletion,
-             addSbtUtilCache)
+  .configure(addSbtIO, addSbtUtilLogging, addSbtUtilPosition, addSbtUtilCache)
   .enablePlugins(ContrabandPlugin, JsonCodecPlugin)
 
 def customCommands: Seq[Setting[_]] = Seq(
   commands += Command.command("release") { state =>
     // "clean" ::
-    "so compile" ::
-      "so publishSigned" ::
+    "+compile" ::
+      "+publishSigned" ::
       "reload" ::
       state
   }

diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/JsonUtil.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/JsonUtil.scala
@@ -1,11 +1,10 @@
 package sbt.internal.librarymanagement
 
 import java.io.File
-import org.apache.ivy.core
-import core.module.descriptor.ModuleDescriptor
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor
+import sbt.io.IO
 import sbt.util.{ CacheStore, Logger }
-import sbt.librarymanagement._
-import sbt.librarymanagement.LibraryManagementCodec._
+import sbt.librarymanagement._, LibraryManagementCodec._
 
 private[sbt] object JsonUtil {
   def sbtOrgTemp = "org.scala-sbt.temp"
@@ -22,14 +21,17 @@ private[sbt] object JsonUtil {
       fromLite(lite, cachedDescriptor)
     } catch {
       case e: Throwable =>
-        log.error("Unable to parse mini graph: " + path.toString)
+        log.error(s"Unable to parse mini graph: $path")
         throw e
     }
   }
+
   def writeUpdateReport(ur: UpdateReport, graphPath: File): Unit = {
-    sbt.io.IO.createDirectory(graphPath.getParentFile)
-    CacheStore(graphPath).write(toLite(ur))
+    val updateReportLite = toLite(ur)
+    IO.createDirectory(graphPath.getParentFile)
+    CacheStore(graphPath).write(updateReportLite)
   }
+
   def toLite(ur: UpdateReport): UpdateReportLite =
     UpdateReportLite(ur.configurations map { cr =>
       ConfigurationReportLite(
@@ -65,6 +67,7 @@ private[sbt] object JsonUtil {
         }
       )
     })
+
   // #1763/#2030. Caller takes up 97% of space, so we need to shrink it down,
   // but there are semantics associated with some of them.
   def filterOutArtificialCallers(callers: Vector[Caller]): Vector[Caller] =

diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/RepositoriesParser.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/RepositoriesParser.scala
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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)
@@ -40,7 +40,7 @@ class OfflineModeSpec extends BaseIvySpecification with DependencyBuilders {
 
     // Compute an estimate to ensure that the second resolution does indeed use the cache
     val originalResolveTime = onlineResolution.right.get.stats.resolveTime
-    val estimatedCachedTime = originalResolveTime * 0.15
+    val estimatedCachedTime = originalResolveTime * 0.3
 
     val offlineResolution =
       IvyActions.updateEither(toResolve, offlineConf, warningConf, noClock, targetDir, log)

diff --git 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
@@ -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
@@ -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
@@ -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 {