From 258cb7c5ac863fd5e9376811b7a3d207a16b4595 Mon Sep 17 00:00:00 2001 From: jvican Date: Fri, 28 Apr 2017 01:16:39 +0200 Subject: [PATCH] Remove unused instance of `retrieve` This commit removes the second instance of `retrieve` that was private and unused, therefore reducing the API surface of `IvyActions`. --- .../librarymanagement/IvyActions.scala | 26 ++++--------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala index c5bce8839..2e5d7bef6 100644 --- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala +++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala @@ -575,27 +575,11 @@ object IvyActions { ivy: Ivy, report: UpdateReport, config: RetrieveConfiguration - ): UpdateReport = - retrieve( - log, - ivy, - report, - config.retrieveDirectory, - config.outputPattern, - config.sync, - config.configurationsToRetrieve - ) - - private def retrieve( - log: Logger, - ivy: Ivy, - report: UpdateReport, - base: File, - pattern: String, - sync: Boolean, - configurationsToRetrieve: Option[Set[Configuration]] ): UpdateReport = { - val configurationNames = configurationsToRetrieve match { + val toRetrieve = config.configurationsToRetrieve + val base = config.retrieveDirectory + val pattern = config.outputPattern + val configurationNames = toRetrieve match { case None => None case Some(configs) => Some(configs.map(_.name)) } @@ -611,7 +595,7 @@ object IvyActions { } IO.copy(toCopy) val resolvedFiles = toCopy.map(_._2) - if (sync) { + if (config.sync) { val filesToDelete = existingFiles.filterNot(resolvedFiles.contains) filesToDelete foreach { f => log.info(s"Deleting old dependency: ${f.getAbsolutePath}")