From 22df64365b600f30df79f182975c41d7d530ed2b Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Wed, 21 Jun 2017 16:22:56 +0100 Subject: [PATCH] Replace util-collection dep with util-position With Position being extracted to its own dependency we can drop this dependency, allowing util-collection to move (back) to sbt/sbt! --- build.sbt | 2 +- project/Dependencies.scala | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index bd002a1d2..7036bdb8f 100644 --- a/build.sbt +++ b/build.sbt @@ -88,7 +88,7 @@ lazy val lm = (project in file("librarymanagement")) (((srcs --- sdirs --- base) pair (relativeTo(sdirs) | relativeTo(base) | flat)) toSeq) } ) - .configure(addSbtIO, addSbtUtilLogging, addSbtUtilCollection, addSbtUtilCache) + .configure(addSbtIO, addSbtUtilLogging, addSbtUtilPosition, addSbtUtilCache) .enablePlugins(ContrabandPlugin, JsonCodecPlugin) def customCommands: Seq[Setting[_]] = Seq( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 290dde04d..73f3d42c3 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,11 +7,11 @@ object Dependencies { val scala212 = "2.12.2" private val ioVersion = "1.0.0-M12" - private val utilVersion = "1.0.0-M25" + private val utilVersion = "1.0.0-M26" private val sbtIO = "org.scala-sbt" %% "io" % ioVersion - private val utilCollection = "org.scala-sbt" %% "util-collection" % utilVersion + private val utilPosition = "org.scala-sbt" %% "util-position" % utilVersion private val utilLogging = "org.scala-sbt" %% "util-logging" % utilVersion private val utilCache = "org.scala-sbt" %% "util-cache" % utilVersion @@ -33,8 +33,8 @@ object Dependencies { } def addSbtIO(p: Project): Project = addSbtModule(p, sbtIoPath, "io", sbtIO) - def addSbtUtilCollection(p: Project): Project = - addSbtModule(p, sbtUtilPath, "utilCollection", utilCollection) + def addSbtUtilPosition(p: Project): Project = + addSbtModule(p, sbtUtilPath, "utilPosition", utilPosition) def addSbtUtilLogging(p: Project): Project = addSbtModule(p, sbtUtilPath, "utilLogging", utilLogging) def addSbtUtilCache(p: Project): Project = addSbtModule(p, sbtUtilPath, "utilCache", utilCache)