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

Minor cleanups per review

This commit is contained in:
Eugene Yokota 2017-07-12 07:15:09 -04:00
parent 7b22e78fd9
commit a98c5f4c65
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/scala/sbt/librarymanagement/DependencyBuilders.scala
View File

@ -5,6 +5,9 @@ package sbt.librarymanagement
import sbt.internal.librarymanagement.StringUtilities.nonEmpty import sbt.internal.librarymanagement.StringUtilities.nonEmpty
/**
* DependencyBuilders implements the implicits for % and %% DSL.
*/
abstract class DependencyBuilders { abstract class DependencyBuilders {
import DependencyBuilders._ import DependencyBuilders._
@ -31,7 +34,7 @@ object DependencyBuilders {
organizationArtifact(name, CrossVersion.binary) organizationArtifact(name, CrossVersion.binary)
private def organizationArtifact(name: String, cross: CrossVersion) = { private def organizationArtifact(name: String, cross: CrossVersion) = {
nonEmpty(name, "Artifact ID") nonEmpty(name, "Name")
new OrganizationArtifactName(organization, name, cross) new OrganizationArtifactName(organization, name, cross)
} }
} }

1
core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala
View File

@ -6,7 +6,6 @@ package sbt.librarymanagement
import java.io.{ IOException, File } import java.io.{ IOException, File }
import java.net.URL import java.net.URL
import scala.xml.XML import scala.xml.XML
// import org.apache.ivy.plugins.resolver.DependencyResolver
import org.xml.sax.SAXParseException import org.xml.sax.SAXParseException
final class RawRepository(val resolver: AnyRef, name: String) extends Resolver(name) { final class RawRepository(val resolver: AnyRef, name: String) extends Resolver(name) {

4
ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala
View File

@ -270,10 +270,10 @@ object IvyActions {
implicit def toIvyFilter(f: ArtifactTypeFilter): IvyFilter = new IvyFilter { implicit def toIvyFilter(f: ArtifactTypeFilter): IvyFilter = new IvyFilter {
override def accept(o: Object): Boolean = Option(o) exists { 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 (f.types contains a.getType) ^ f.inverted
} }

2
ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala
View File

@ -209,7 +209,7 @@ private[sbt] class CachedResolutionResolveCache {
else None) match { else None) match {
case Some(path) => case Some(path) =>
log.debug(s"parsing ${path.getAbsolutePath.toString}") 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 }) { if (ur.allFiles forall { _.exists }) {
updateReportCache(md.getModuleRevisionId) = Right(ur) updateReportCache(md.getModuleRevisionId) = Right(ur)
Some(Right(ur)) Some(Right(ur))