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

Rather use `globalSettingsDirectory` instead of `globalBaseDirectory`

This commit is contained in:
Indrajit Raychaudhuri 2012-03-01 17:23:08 +05:30
parent 0fead533c0
commit 9ca86725b5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/Opts.scala
View File

@ -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
}