diff --git a/main/src/main/scala/sbt/BuildPaths.scala b/main/src/main/scala/sbt/BuildPaths.scala index 478753ea4..67a35106b 100644 --- a/main/src/main/scala/sbt/BuildPaths.scala +++ b/main/src/main/scala/sbt/BuildPaths.scala @@ -46,18 +46,11 @@ object BuildPaths def outputDirectory(base: File) = base / DefaultTargetName def projectStandard(base: File) = base / "project" - def projectHidden(base: File) = base / ConfigDirectoryName - def selectProjectDir(base: File, log: Logger) = - { - val a = projectHidden(base) - val b = projectStandard(base) - if(a.exists) - { - log.warn("Alternative project directory " + ConfigDirectoryName + " (" + a + ") has been deprecated since sbt 0.12.0.\n Please use the standard location: " + b) - a - } - else b - } + + @deprecated("Use projectStandard. The alternative project directory location has been removed.", "0.13.0") + def projectHidden(base: File) = projectStandard(base) + @deprecated("Use projectStandard. The alternative project directory location has been removed.", "0.13.0") + def selectProjectDir(base: File, log: Logger) = projectStandard(base) final val PluginsDirectoryName = "plugins" final val DefaultTargetName = "target" diff --git a/main/src/main/scala/sbt/Load.scala b/main/src/main/scala/sbt/Load.scala index 31aaf6ba5..1e08a69ca 100755 --- a/main/src/main/scala/sbt/Load.scala +++ b/main/src/main/scala/sbt/Load.scala @@ -392,7 +392,7 @@ object Load def loadUnit(uri: URI, localBase: File, s: State, config: LoadBuildConfiguration): BuildUnit = { val normBase = localBase.getCanonicalFile - val defDir = selectProjectDir(normBase, config.log) + val defDir = projectStandard(normBase) val plugs = plugins(defDir, s, config) val defNames = analyzed(plugs.fullClasspath) flatMap findDefinitions