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

Allow empty initial dependencies in Resolution

This commit is contained in:
Alexandre Archambault 2015-06-25 00:18:50 +01:00
parent 0de5330351
commit 510dd7b2d4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core-jvm/src/main/scala/coursier/core/package.scala
View File

@ -11,7 +11,7 @@ package object core {
profileActivation: Option[(String, Activation, Map[String, String]) => Boolean]): Stream[Resolution] = {
val startResolution = Resolution(
dependencies, dependencies, Set.empty,
dependencies, Set.empty, Set.empty,
Map.empty, Map.empty,
filter,
profileActivation

4
core/src/main/scala/coursier/core/Resolution.scala
View File

@ -330,7 +330,7 @@ object Resolution {
val dependencies0 = dependencies.map(withDefaultScope)
val startResolution = Resolution(
dependencies0, dependencies0, Set.empty,
dependencies0, Set.empty, Set.empty,
Map.empty, Map.empty,
filter,
profileActivation
@ -397,7 +397,7 @@ case class Resolution(rootDependencies: Set[Dependency],
* Returns a tuple made of the conflicting dependencies, and all the dependencies.
*/
def nextDependenciesAndConflicts: (Seq[Dependency], Seq[Dependency]) = {
merge(dependencies ++ transitiveDependencies)
merge(rootDependencies ++ dependencies ++ transitiveDependencies)
}
/**