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

Always use same Function1 instance for Resolution fields 

Allows to use the resolution as cache key
This commit is contained in:
Alexandre Archambault 2017-05-15 15:32:54 +02:00
parent c4d3918792
commit 6e0c6c3515
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sbt-coursier/src/main/scala/coursier/Tasks.scala
View File

@ -425,6 +425,9 @@ object Tasks {
}
}
private val noOptionalFilter: Option[Dependency => Boolean] = Some(dep => !dep.optional)
private val typelevelOrgSwap: Option[Dependency => Dependency] = Some(Typelevel.swap(_))
def resolutionTask(
sbtClassifiers: Boolean = false
@ -506,7 +509,7 @@ object Tasks {
val startRes = Resolution(
currentProject.dependencies.map(_._2).toSet,
filter = Some(dep => !dep.optional),
filter = noOptionalFilter,
userActivations =
if (userEnabledProfiles.isEmpty)
None
@ -518,7 +521,7 @@ object Tasks {
forcedScalaModules(so, sv) ++
interProjectDependencies.map(_.moduleVersion),
projectCache = parentProjectCache,
mapDependencies = if (typelevel) Some(Typelevel.swap(_)) else None
mapDependencies = if (typelevel) typelevelOrgSwap else None
)
if (verbosityLevel >= 2) {
@ -1060,7 +1063,7 @@ object Tasks {
reportsCache.getOrElseUpdate(
ReportCacheKey(
currentProject,
res.copy(filter = None),
res,
withClassifiers,
sbtClassifiers
),