Merge pull request #86 from dwijnand/detangle

Detangle the dependencies, particularly collection.

build.sbt

@@ -32,7 +32,7 @@ def commonSettings: Seq[Setting[_]] = Seq(
 
 lazy val utilRoot: Project = (project in file(".")).
   aggregate(
-    utilInterface, utilControl, utilCollection, utilApplyMacro, utilComplete,
+    utilInterface, utilControl, utilPosition, utilCollection, utilApplyMacro, utilComplete,
     utilLogging, utilRelation, utilLogic, utilCache, utilTracking, utilTesting,
     utilScripted
   ).
@@ -76,14 +76,19 @@ lazy val utilControl = (project in internalPath / "util-control").
     name := "Util Control"
   )
 
+val utilPosition = (project in file("internal") / "util-position").settings(
+  commonSettings,
+  name := "Util Position"
+)
+
 lazy val utilCollection = (project in internalPath / "util-collection").
-  dependsOn(utilTesting % Test).
+  dependsOn(utilPosition, utilTesting % Test).
   settings(
     commonSettings,
     crossScalaVersions := Seq(scala210, scala211, scala212),
     Util.keywordsSettings,
     name := "Util Collection",
-    libraryDependencies ++= Seq(sjsonnew.value)
+    libraryDependencies ++= Seq(sjsonnew.value, sjsonnewScalaJson.value % Test)
   )
 
 lazy val utilApplyMacro = (project in internalPath / "util-appmacro").
@@ -107,7 +112,7 @@ lazy val utilComplete = (project in internalPath / "util-complete").
 // logging
 lazy val utilLogging = (project in internalPath / "util-logging").
   enablePlugins(ContrabandPlugin, JsonCodecPlugin).
-  dependsOn(utilInterface, utilCollection, utilTesting % Test).
+  dependsOn(utilInterface, utilTesting % Test).
   settings(
     commonSettings,
     crossScalaVersions := Seq(scala210, scala211, scala212),
@@ -140,7 +145,7 @@ lazy val utilLogic = (project in internalPath / "util-logic").
 
 // Persisted caching based on sjson-new
 lazy val utilCache = (project in file("util-cache")).
-  dependsOn(utilCollection, utilTesting % Test).
+  dependsOn(utilTesting % Test).
   settings(
     commonSettings,
     name := "Util Cache",

internal/util-collection/src/main/scala/sbt/internal/util/HListFormats.scala

@@ -66,3 +66,5 @@ trait HListFormats {
     def read[J](jsOpt: Option[J], unbuilder: Unbuilder[J]) = hnil
   }
 }
+
+object HListFormats extends HListFormats

internal/util-collection/src/test/scala/HListFormatSpec.scala

@@ -1,9 +1,10 @@
-package sbt.util
+package sbt
+package internal
+package util
 
 import scalajson.ast.unsafe._
-import sjsonnew._, support.scalajson.unsafe._
-import CacheImplicits._
-import sbt.internal.util.{ UnitSpec, HNil }
+import sjsonnew._, BasicJsonProtocol._, support.scalajson.unsafe._
+import HListFormats._
 
 class HListFormatSpec extends UnitSpec {
   val quux = 23 :+: "quux" :+: true :+: HNil

util-cache/src/main/scala/sbt/util/CacheImplicits.scala

@@ -1,9 +1,7 @@
 package sbt.util
 
 import sjsonnew.BasicJsonProtocol
-import sbt.internal.util.HListFormats
 
 object CacheImplicits extends CacheImplicits
 trait CacheImplicits extends BasicCacheImplicits
   with BasicJsonProtocol
-  with HListFormats