From 544565bf9821628681615710f5bbf2f95bb40ba9 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Thu, 11 Jul 2013 18:49:30 -0400
Subject: [PATCH] clean up some ConvertResolver parameter lists

---
 ivy/src/main/scala/sbt/ConvertResolver.scala | 16 ++++++++--------
 ivy/src/main/scala/sbt/Ivy.scala             |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ivy/src/main/scala/sbt/ConvertResolver.scala b/ivy/src/main/scala/sbt/ConvertResolver.scala
index 293963a2d..5d3c6836e 100644
--- a/ivy/src/main/scala/sbt/ConvertResolver.scala
+++ b/ivy/src/main/scala/sbt/ConvertResolver.scala
@@ -15,7 +15,7 @@ import plugins.resolver.{AbstractPatternsBasedResolver, AbstractSshBasedResolver
 private object ConvertResolver
 {
 	/** 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
 		{
@@ -45,21 +45,21 @@ private object ConvertResolver
 			case repo: SshRepository =>
 			{
 				val resolver = new SshResolver with DescriptorRequired
-				initializeSSHResolver(resolver, repo)
+				initializeSSHResolver(resolver, repo, settings)
 				repo.publishPermissions.foreach(perm => resolver.setPublishPermissions(perm))
 				resolver
 			}
 			case repo: SftpRepository =>
 			{
 				val resolver = new SFTPResolver
-				initializeSSHResolver(resolver, repo)
+				initializeSSHResolver(resolver, repo, settings)
 				resolver
 			}
 			case repo: FileRepository =>
 			{
 				val resolver = new FileSystemResolver with DescriptorRequired
 				resolver.setName(repo.name)
-				initializePatterns(resolver, repo.patterns)
+				initializePatterns(resolver, repo.patterns, settings)
 				import repo.configuration.{isLocal, isTransactional}
 				resolver.setLocal(isLocal)
 				isTransactional.foreach(value => resolver.setTransactional(value.toString))
@@ -69,7 +69,7 @@ private object ConvertResolver
 			{
 				val resolver = new URLResolver with DescriptorRequired
 				resolver.setName(repo.name)
-				initializePatterns(resolver, repo.patterns)
+				initializePatterns(resolver, repo.patterns, settings)
 				resolver
 			}
 			case repo: ChainedResolver => IvySbt.resolverChain(repo.name, repo.resolvers, false, settings, log)
@@ -95,11 +95,11 @@ private object ConvertResolver
 		resolver.setM2compatible(true)
 		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.setPassfile(null)
-		initializePatterns(resolver, repo.patterns)
+		initializePatterns(resolver, repo.patterns, settings)
 		initializeConnection(resolver, repo.connection)
 	}
 	private def initializeConnection(resolver: AbstractSshBasedResolver, connection: RepositoryHelpers.SshConnection)
@@ -119,7 +119,7 @@ private object ConvertResolver
 					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)
 		patterns.ivyPatterns.foreach(p => resolver.addIvyPattern(settings substitute p))
diff --git a/ivy/src/main/scala/sbt/Ivy.scala b/ivy/src/main/scala/sbt/Ivy.scala
index 0a162b2b4..7b253408a 100644
--- a/ivy/src/main/scala/sbt/Ivy.scala
+++ b/ivy/src/main/scala/sbt/Ivy.scala
@@ -266,7 +266,7 @@ private object IvySbt
 		newDefault.setCheckmodified(false)
 		for(sbtResolver <- resolvers) {
 			log.debug("\t" + sbtResolver)
-			newDefault.add(ConvertResolver(sbtResolver)(settings, log))
+			newDefault.add(ConvertResolver(sbtResolver, settings, log))
 		}
 		newDefault
 	}
@@ -274,7 +274,7 @@ private object IvySbt
 	{
 		for(r <- resolvers) {
 			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,
@@ -294,7 +294,7 @@ private object IvySbt
 			import IvyPatternHelper._
 			import PatternMatcher._
 			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))
 			settings.addModuleConfiguration(attributes, settings.getMatcher(EXACT_OR_REGEXP), resolver.name, null, null, null)
 		}