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

Using iterators

This commit is contained in:
Eugene Yokota 2014-08-11 22:49:48 -04:00
parent 01c95b5d62
commit d11427dd85
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ivy/src/main/scala/sbt/Ivy.scala
View File

@ -81,13 +81,6 @@ final class IvySbt(val configuration: IvyConfiguration) {
IvySbt.setResolvers(is, i.resolvers, i.otherResolvers, i.localOnly, configuration.updateOptions, configuration.log)
IvySbt.setModuleConfigurations(is, i.moduleConfigurations, configuration.log)
}
// is.addVersionMatcher(new ExactVersionMatcher {
// override def isDynamic(askedMrid: ModuleRevisionId): Boolean = {
// askedMrid.getRevision endsWith "-SNAPSHOT"
// }
// override def accept(askedMrid: ModuleRevisionId, foundMrid: ModuleRevisionId): Boolean =
// askedMrid.getRevision == foundMrid.getRevision
// })
is
}
private lazy val ivy: Ivy =
@ -438,12 +431,13 @@ private object IvySbt {
case _ =>
None
}
val artifactRefs = md.getConfigurations.toVector flatMap { conf =>
md.getArtifacts(conf.getName).toVector flatMap { af =>
artifactRef(af, data.getDate).toVector
val artifactRefs = md.getConfigurations.toIterator flatMap { conf =>
md.getArtifacts(conf.getName).toIterator flatMap { af =>
artifactRef(af, data.getDate).toIterator
}
}
artifactRefs.headOption
if (artifactRefs.hasNext) Some(artifactRefs.next)
else None
}
/** Ported from ChainResolver#forcedRevision. */
private[this] def forcedRevision(rmr: ResolvedModuleRevision): ResolvedModuleRevision =