From 9ca86725b54e2d33a24998b6b1301e0c4090cb83 Mon Sep 17 00:00:00 2001 From: Indrajit Raychaudhuri Date: Thu, 1 Mar 2012 17:23:08 +0530 Subject: [PATCH] Rather use `globalSettingsDirectory` instead of `globalBaseDirectory` --- main/Opts.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main/Opts.scala b/main/Opts.scala index af8e596c3..eb0396d67 100644 --- a/main/Opts.scala +++ b/main/Opts.scala @@ -25,14 +25,15 @@ object Opts { object DefaultOptions { import Opts._ import Path._ + import BuildPaths.{getGlobalBase, getGlobalSettingsDirectory} def javac: Seq[String] = compile.encoding("UTF-8") def scalac: Seq[String] = compile.encoding("UTF-8") def javadoc(name: String, version: String): Seq[String] = Seq("-doctitle", "%s %s API".format(name, version)) def scaladoc(name: String, version: String): Seq[String] = doc.title(name) ++ doc.version(version) - @deprecated("Use `credentials(State)` instead to make use of configuration path dynamically configured via `Keys.globalBaseDirectory`; relying on ~/.ivy2 is not recommended anymore.", "0.12.0") + @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") - def credentials(s: State): Credentials = Credentials(BuildPaths.getGlobalBase(s) / ".credentials") + def credentials(s: State): Credentials = Credentials(getGlobalSettingsDirectory(s, getGlobalBase(s)) / ".credentials") def addCredentials: Project.Setting[_] = Keys.credentials <+= Keys.state map credentials }