luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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!
This commit is contained in:
Dale Wijnand 2017-06-21 16:22:56 +01:00
parent a375f57101
commit 22df64365b
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -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(

8
project/Dependencies.scala
View File

@ -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)