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

clean up some ConvertResolver parameter lists

This commit is contained in:
Mark Harrah 2013-07-11 18:49:30 -04:00
parent 4795799a15
commit 544565bf98
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ import plugins.resolver.{AbstractPatternsBasedResolver, AbstractSshBasedResolver
private object ConvertResolver private object ConvertResolver
{ {
/** Converts the given sbt resolver into an Ivy resolver..*/ /** Converts the given sbt resolver into an Ivy resolver..*/
def apply(r: Resolver)(implicit settings: IvySettings, log: Logger) = def apply(r: Resolver, settings: IvySettings, log: Logger) =
{ {
r match r match
{ {
@ -45,21 +45,21 @@ private object ConvertResolver
case repo: SshRepository => case repo: SshRepository =>
{ {
val resolver = new SshResolver with DescriptorRequired val resolver = new SshResolver with DescriptorRequired
initializeSSHResolver(resolver, repo) initializeSSHResolver(resolver, repo, settings)
repo.publishPermissions.foreach(perm => resolver.setPublishPermissions(perm)) repo.publishPermissions.foreach(perm => resolver.setPublishPermissions(perm))
resolver resolver
} }
case repo: SftpRepository => case repo: SftpRepository =>
{ {
val resolver = new SFTPResolver val resolver = new SFTPResolver
initializeSSHResolver(resolver, repo) initializeSSHResolver(resolver, repo, settings)
resolver resolver
} }
case repo: FileRepository => case repo: FileRepository =>
{ {
val resolver = new FileSystemResolver with DescriptorRequired val resolver = new FileSystemResolver with DescriptorRequired
resolver.setName(repo.name) resolver.setName(repo.name)
initializePatterns(resolver, repo.patterns) initializePatterns(resolver, repo.patterns, settings)
import repo.configuration.{isLocal, isTransactional} import repo.configuration.{isLocal, isTransactional}
resolver.setLocal(isLocal) resolver.setLocal(isLocal)
isTransactional.foreach(value => resolver.setTransactional(value.toString)) isTransactional.foreach(value => resolver.setTransactional(value.toString))
@ -69,7 +69,7 @@ private object ConvertResolver
{ {
val resolver = new URLResolver with DescriptorRequired val resolver = new URLResolver with DescriptorRequired
resolver.setName(repo.name) resolver.setName(repo.name)
initializePatterns(resolver, repo.patterns) initializePatterns(resolver, repo.patterns, settings)
resolver resolver
} }
case repo: ChainedResolver => IvySbt.resolverChain(repo.name, repo.resolvers, false, settings, log) case repo: ChainedResolver => IvySbt.resolverChain(repo.name, repo.resolvers, false, settings, log)
@ -95,11 +95,11 @@ private object ConvertResolver
resolver.setM2compatible(true) resolver.setM2compatible(true)
resolver.setRoot(root) resolver.setRoot(root)
} }
private def initializeSSHResolver(resolver: AbstractSshBasedResolver, repo: SshBasedRepository)(implicit settings: IvySettings) private def initializeSSHResolver(resolver: AbstractSshBasedResolver, repo: SshBasedRepository, settings: IvySettings)
{ {
resolver.setName(repo.name) resolver.setName(repo.name)
resolver.setPassfile(null) resolver.setPassfile(null)
initializePatterns(resolver, repo.patterns) initializePatterns(resolver, repo.patterns, settings)
initializeConnection(resolver, repo.connection) initializeConnection(resolver, repo.connection)
} }
private def initializeConnection(resolver: AbstractSshBasedResolver, connection: RepositoryHelpers.SshConnection) private def initializeConnection(resolver: AbstractSshBasedResolver, connection: RepositoryHelpers.SshConnection)
@ -119,7 +119,7 @@ private object ConvertResolver
setUser(user) setUser(user)
} }
} }
private def initializePatterns(resolver: AbstractPatternsBasedResolver, patterns: Patterns)(implicit settings: IvySettings) private def initializePatterns(resolver: AbstractPatternsBasedResolver, patterns: Patterns, settings: IvySettings)
{ {
resolver.setM2compatible(patterns.isMavenCompatible) resolver.setM2compatible(patterns.isMavenCompatible)
patterns.ivyPatterns.foreach(p => resolver.addIvyPattern(settings substitute p)) patterns.ivyPatterns.foreach(p => resolver.addIvyPattern(settings substitute p))

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

@ -266,7 +266,7 @@ private object IvySbt
newDefault.setCheckmodified(false) newDefault.setCheckmodified(false)
for(sbtResolver <- resolvers) { for(sbtResolver <- resolvers) {
log.debug("\t" + sbtResolver) log.debug("\t" + sbtResolver)
newDefault.add(ConvertResolver(sbtResolver)(settings, log)) newDefault.add(ConvertResolver(sbtResolver, settings, log))
} }
newDefault newDefault
} }
@ -274,7 +274,7 @@ private object IvySbt
{ {
for(r <- resolvers) { for(r <- resolvers) {
log.debug("\t" + r) log.debug("\t" + r)
settings.addResolver(ConvertResolver(r)(settings, log)) settings.addResolver(ConvertResolver(r, settings, log))
} }
} }
/** A hack to detect if the given artifact is an automatically generated request for a classifier, /** A hack to detect if the given artifact is an automatically generated request for a classifier,
@ -294,7 +294,7 @@ private object IvySbt
import IvyPatternHelper._ import IvyPatternHelper._
import PatternMatcher._ import PatternMatcher._
if(!existing.contains(resolver.name)) if(!existing.contains(resolver.name))
settings.addResolver(ConvertResolver(resolver)(settings, log)) settings.addResolver(ConvertResolver(resolver, settings, log))
val attributes = javaMap(Map(MODULE_KEY -> name, ORGANISATION_KEY -> organization, REVISION_KEY -> revision)) val attributes = javaMap(Map(MODULE_KEY -> name, ORGANISATION_KEY -> organization, REVISION_KEY -> revision))
settings.addModuleConfiguration(attributes, settings.getMatcher(EXACT_OR_REGEXP), resolver.name, null, null, null) settings.addModuleConfiguration(attributes, settings.getMatcher(EXACT_OR_REGEXP), resolver.name, null, null, null)
} }