From 7b97b6833f81b87f3e04f3ea3ce5b2fe518c57f3 Mon Sep 17 00:00:00 2001 From: Indrajit Raychaudhuri Date: Tue, 28 Feb 2012 22:53:17 +0530 Subject: [PATCH] Credentials should be kept in SBT's own global base location The old convention of keeping credentials in ~/.ivy2 isn't recommended anymore, they can instead go in (customizable) global base location. The global base defaults to `~/.sbt`, hence credentials go in `~/.sbt/.credentials` (c.f. `Keys.globalBaseDirectory` and system property `sbt.global.base`) --- main/Opts.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main/Opts.scala b/main/Opts.scala index c8ceebfef..7f0e47446 100644 --- a/main/Opts.scala +++ b/main/Opts.scala @@ -29,5 +29,7 @@ object DefaultOptions { 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) - def credentials: Credentials = Credentials(userHome / ".sbt" / ".credentials") + @deprecated("Use `credentials(State)` instead.", "0.12.0") + def credentials: Credentials = Credentials(userHome / ".ivy2" / ".credentials") + def credentials(s: State): Credentials = Credentials(BuildPaths.getGlobalBase(s) / ".credentials") }