From f2f1d063299aa9699c8e4234dc3d1ccc15029029 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 14 Sep 2018 00:55:55 -0400 Subject: [PATCH] Remove old warning about global dir Fixes #1054 --- main/src/main/scala/sbt/BuildPaths.scala | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/main/src/main/scala/sbt/BuildPaths.scala b/main/src/main/scala/sbt/BuildPaths.scala index b74bfde44..a19ceec0c 100644 --- a/main/src/main/scala/sbt/BuildPaths.scala +++ b/main/src/main/scala/sbt/BuildPaths.scala @@ -44,17 +44,7 @@ object BuildPaths { def getGlobalBase(state: State): File = { val default = defaultVersionedGlobalBase(binarySbtVersion(state)) - def getDefault = { checkTransition(state, default); default } - getFileSetting(globalBaseDirectory, GlobalBaseProperty, getDefault)(state) - } - private[this] def checkTransition(state: State, versioned: File): Unit = { - val unversioned = defaultGlobalBase - def globalDefined(base: File): Boolean = - getGlobalPluginsDirectory(state, base).exists || - configurationSources(getGlobalSettingsDirectory(state, base)).exists(_.exists) - val warnTransition = !globalDefined(versioned) && globalDefined(unversioned) - if (warnTransition) - state.log.warn(globalDirTransitionWarning(unversioned, versioned)) + getFileSetting(globalBaseDirectory, GlobalBaseProperty, default)(state) } def getStagingDirectory(state: State, globalBase: File): File = @@ -122,10 +112,4 @@ object BuildPaths { def crossPath(base: File, instance: xsbti.compile.ScalaInstance): File = base / ("scala_" + instance.version) - - private[this] def globalDirTransitionWarning(unversioned: File, versioned: File): String = - s"""The global sbt directory is now versioned and is located at $versioned. - You are seeing this warning because there is global configuration in $unversioned but not in $versioned. - The global sbt directory may be changed via the $GlobalBaseProperty system property. -""" }