From 717991238797966094fadfc36a3b8f5daf7fcf32 Mon Sep 17 00:00:00 2001 From: Indrajit Raychaudhuri Date: Thu, 10 Apr 2014 03:16:41 -0500 Subject: [PATCH] `DefaultOptions` for resolvers should not resets existing values. `DefaultOptions.addResolvers` and `DefaultOptions.addPluginResolvers` should not reset the existing value while adding the new ones. The names are prefixed with _add_ afterall. --- main/src/main/scala/sbt/Opts.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/src/main/scala/sbt/Opts.scala b/main/src/main/scala/sbt/Opts.scala index cb78f5adc..1fddce915 100644 --- a/main/src/main/scala/sbt/Opts.scala +++ b/main/src/main/scala/sbt/Opts.scala @@ -52,8 +52,8 @@ object DefaultOptions { def pluginResolvers(plugin: Boolean, snapshot: Boolean): Seq[Resolver] = { if (plugin && snapshot) Seq(Classpaths.typesafeSnapshots, Classpaths.sbtPluginSnapshots) else Nil } - def addResolvers: Setting[_] = Keys.resolvers <<= Keys.isSnapshot apply resolvers - def addPluginResolvers: Setting[_] = Keys.resolvers <<= (Keys.sbtPlugin, Keys.isSnapshot) apply pluginResolvers + def addResolvers: Setting[_] = Keys.resolvers <++= Keys.isSnapshot apply resolvers + def addPluginResolvers: Setting[_] = Keys.resolvers <++= (Keys.sbtPlugin, Keys.isSnapshot) apply pluginResolvers @deprecated("Use `credentials(State)` instead to make use of configuration path dynamically configured via `Keys.globalSettingsDirectory`; relying on ~/.ivy2 is not recommended anymore.", "0.12.0") def credentials: Credentials = Credentials(userHome / ".ivy2" / ".credentials")