From 723abc945f8e5a5239af9abd297b3fa33c91eaa2 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Mon, 3 Apr 2017 11:22:38 +0100 Subject: [PATCH] Overload RichUpdateReport#select instead of using default args --- .../sbt/librarymanagement/RichUpdateReport.scala | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/librarymanagement/src/main/scala/sbt/librarymanagement/RichUpdateReport.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/RichUpdateReport.scala index d9b63c928..12fb4be8d 100644 --- a/librarymanagement/src/main/scala/sbt/librarymanagement/RichUpdateReport.scala +++ b/librarymanagement/src/main/scala/sbt/librarymanagement/RichUpdateReport.scala @@ -20,14 +20,14 @@ final class RichUpdateReport(report: UpdateReport) { /** Obtains all successfully retrieved files in configurations, modules, and artifacts matching the specified filter. */ private[sbt] def matching(f: DependencyFilter): Seq[File] = select0(f).distinct - /** Obtains all successfully retrieved files matching all provided filters. An unspecified argument matches all files. */ - def select( - configuration: ConfigurationFilter = configurationFilter(), - module: ModuleFilter = moduleFilter(), - artifact: ArtifactFilter = artifactFilter() - ): Seq[File] = + /** Obtains all successfully retrieved files matching all provided filters. */ + def select(configuration: ConfigurationFilter, module: ModuleFilter, artifact: ArtifactFilter): Seq[File] = matching(DependencyFilter.make(configuration, module, artifact)) + def select(configuration: ConfigurationFilter): Seq[File] = select(configuration, moduleFilter(), artifactFilter()) + def select(module: ModuleFilter): Seq[File] = select(configurationFilter(), module, artifactFilter()) + def select(artifact: ArtifactFilter): Seq[File] = select(configurationFilter(), moduleFilter(), artifact) + private[this] def select0(f: DependencyFilter): Seq[File] = for (cReport <- report.configurations; mReport <- cReport.modules; (artifact, file) <- mReport.artifacts if f(cReport.configuration, mReport.module, artifact)) yield { if (file == null) sys.error("Null file: conf=" + cReport.configuration + ", module=" + mReport.module + ", art: " + artifact)