From a98c5f4c65d8093d45f083762d314a226f30f37d Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Wed, 12 Jul 2017 07:15:09 -0400 Subject: [PATCH] Minor cleanups per review --- .../scala/sbt/librarymanagement/DependencyBuilders.scala | 5 ++++- .../src/main/scala/sbt/librarymanagement/ResolverExtra.scala | 1 - .../scala/sbt/internal/librarymanagement/IvyActions.scala | 4 ++-- .../ivyint/CachedResolutionResolveEngine.scala | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/src/main/scala/sbt/librarymanagement/DependencyBuilders.scala b/core/src/main/scala/sbt/librarymanagement/DependencyBuilders.scala index 8191cb1bf..5c4071dd5 100755 --- a/core/src/main/scala/sbt/librarymanagement/DependencyBuilders.scala +++ b/core/src/main/scala/sbt/librarymanagement/DependencyBuilders.scala @@ -5,6 +5,9 @@ package sbt.librarymanagement import sbt.internal.librarymanagement.StringUtilities.nonEmpty +/** + * DependencyBuilders implements the implicits for % and %% DSL. + */ abstract class DependencyBuilders { import DependencyBuilders._ @@ -31,7 +34,7 @@ object DependencyBuilders { organizationArtifact(name, CrossVersion.binary) private def organizationArtifact(name: String, cross: CrossVersion) = { - nonEmpty(name, "Artifact ID") + nonEmpty(name, "Name") new OrganizationArtifactName(organization, name, cross) } } diff --git a/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala b/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala index 3ded29183..52e0b7fd2 100644 --- a/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala +++ b/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala @@ -6,7 +6,6 @@ package sbt.librarymanagement import java.io.{ IOException, File } import java.net.URL import scala.xml.XML -// import org.apache.ivy.plugins.resolver.DependencyResolver import org.xml.sax.SAXParseException final class RawRepository(val resolver: AnyRef, name: String) extends Resolver(name) { diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala index 25decece0..4aa761d66 100644 --- a/ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala +++ b/ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala @@ -270,10 +270,10 @@ object IvyActions { implicit def toIvyFilter(f: ArtifactTypeFilter): IvyFilter = new IvyFilter { override def accept(o: Object): Boolean = Option(o) exists { - case a: IArtifact => applyFilter(f, a) + case a: IArtifact => applyFilter(a) } - def applyFilter(f: ArtifactTypeFilter, a: IArtifact): Boolean = + def applyFilter(a: IArtifact): Boolean = (f.types contains a.getType) ^ f.inverted } diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala index fa3846da2..4cebabdc4 100644 --- a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala +++ b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala @@ -209,7 +209,7 @@ private[sbt] class CachedResolutionResolveCache { else None) match { case Some(path) => log.debug(s"parsing ${path.getAbsolutePath.toString}") - val ur = JsonUtil.parseUpdateReport( /* md, */ path, cachedDescriptor, log) + val ur = JsonUtil.parseUpdateReport(path, cachedDescriptor, log) if (ur.allFiles forall { _.exists }) { updateReportCache(md.getModuleRevisionId) = Right(ur) Some(Right(ur))