From ceccbf2d5ad16814f5ef89bc05fc7624b1b9c230 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sun, 24 Jan 2016 16:50:21 -0800
Subject: [PATCH] Fixes #2415. Hide global setting fix behind
 sbt.globalsettingfix

We are hiding a bug fix on global setting that was not importing auto
imports because fixing this via sbt/sbt#2399 breaks the source
compatibility: sbt/sbt#2415
I've split out the relevant portion of the scripted test into
global-settings, and marked it pending.
---
 main/src/main/scala/sbt/Load.scala                    |  9 ++++++++-
 .../project/global-plugin/global/plugins/A.scala      | 10 ----------
 .../project/global-settings/global/plugins/A.scala    | 11 +++++++++++
 .../global/plugins/B.scala                            |  0
 .../global/useGlobalAutoPlugin.sbt                    |  0
 .../global/useGlobalLegacyPlugin.sbt                  |  0
 sbt/src/sbt-test/project/global-settings/pending      |  3 +++
 7 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 sbt/src/sbt-test/project/global-settings/global/plugins/A.scala
 rename sbt/src/sbt-test/project/{global-plugin => global-settings}/global/plugins/B.scala (100%)
 rename sbt/src/sbt-test/project/{global-plugin => global-settings}/global/useGlobalAutoPlugin.sbt (100%)
 rename sbt/src/sbt-test/project/{global-plugin => global-settings}/global/useGlobalLegacyPlugin.sbt (100%)
 create mode 100644 sbt/src/sbt-test/project/global-settings/pending

diff --git a/main/src/main/scala/sbt/Load.scala b/main/src/main/scala/sbt/Load.scala
index e5d8a5113..ed20fb389 100755
--- a/main/src/main/scala/sbt/Load.scala
+++ b/main/src/main/scala/sbt/Load.scala
@@ -71,12 +71,19 @@ object Load {
         if (files.isEmpty || base == globalBase) const(Nil) else buildGlobalSettings(globalBase, files, config)
       config.copy(injectSettings = config.injectSettings.copy(projectLoaded = compiled))
     }
+  // We are hiding a bug fix on global setting that was not importing auto imports.
+  // Because fixing this via https://github.com/sbt/sbt/pull/2399
+  // breaks the source compatibility: https://github.com/sbt/sbt/issues/2415
+  @deprecated("Remove this when we can break source compatibility.", "0.13.10")
+  private[sbt] def useAutoImportInGlobal = sys.props.get("sbt.globalsettingfix") map { _.toLowerCase == "true" } getOrElse false
   def buildGlobalSettings(base: File, files: Seq[File], config: sbt.LoadBuildConfiguration): ClassLoader => Seq[Setting[_]] =
     {
       val eval = mkEval(data(config.globalPluginClasspath), base, defaultEvalOptions)
 
       val imports = BuildUtil.baseImports ++
-        config.detectedGlobalPlugins.imports
+        (// when we can beak the source compat, remove this if and use config.detectedGlobalPlugins.imports
+        if (useAutoImportInGlobal) config.detectedGlobalPlugins.imports
+        else BuildUtil.importAllRoot(config.globalPluginNames))
 
       loader => {
         val loaded = EvaluateConfigurations(eval, files, imports)(loader)
diff --git a/sbt/src/sbt-test/project/global-plugin/global/plugins/A.scala b/sbt/src/sbt-test/project/global-plugin/global/plugins/A.scala
index bbf9fc243..b75a623b5 100644
--- a/sbt/src/sbt-test/project/global-plugin/global/plugins/A.scala
+++ b/sbt/src/sbt-test/project/global-plugin/global/plugins/A.scala
@@ -1,15 +1,5 @@
 package test
 
-import sbt._
-
 object Global {
   val x = 3
 }
-
-object GlobalAutoPlugin extends AutoPlugin {
-
-  object autoImport {
-    lazy val globalAutoPluginSetting = settingKey[String]("A top level setting declared in a plugin.")
-  }
-
-}
diff --git a/sbt/src/sbt-test/project/global-settings/global/plugins/A.scala b/sbt/src/sbt-test/project/global-settings/global/plugins/A.scala
new file mode 100644
index 000000000..ee7171f10
--- /dev/null
+++ b/sbt/src/sbt-test/project/global-settings/global/plugins/A.scala
@@ -0,0 +1,11 @@
+package test
+
+import sbt._
+
+object GlobalAutoPlugin extends AutoPlugin {
+
+  object autoImport {
+    lazy val globalAutoPluginSetting = settingKey[String]("A top level setting declared in a plugin.")
+  }
+
+}
diff --git a/sbt/src/sbt-test/project/global-plugin/global/plugins/B.scala b/sbt/src/sbt-test/project/global-settings/global/plugins/B.scala
similarity index 100%
rename from sbt/src/sbt-test/project/global-plugin/global/plugins/B.scala
rename to sbt/src/sbt-test/project/global-settings/global/plugins/B.scala
diff --git a/sbt/src/sbt-test/project/global-plugin/global/useGlobalAutoPlugin.sbt b/sbt/src/sbt-test/project/global-settings/global/useGlobalAutoPlugin.sbt
similarity index 100%
rename from sbt/src/sbt-test/project/global-plugin/global/useGlobalAutoPlugin.sbt
rename to sbt/src/sbt-test/project/global-settings/global/useGlobalAutoPlugin.sbt
diff --git a/sbt/src/sbt-test/project/global-plugin/global/useGlobalLegacyPlugin.sbt b/sbt/src/sbt-test/project/global-settings/global/useGlobalLegacyPlugin.sbt
similarity index 100%
rename from sbt/src/sbt-test/project/global-plugin/global/useGlobalLegacyPlugin.sbt
rename to sbt/src/sbt-test/project/global-settings/global/useGlobalLegacyPlugin.sbt
diff --git a/sbt/src/sbt-test/project/global-settings/pending b/sbt/src/sbt-test/project/global-settings/pending
new file mode 100644
index 000000000..1b6bd3c6f
--- /dev/null
+++ b/sbt/src/sbt-test/project/global-settings/pending
@@ -0,0 +1,3 @@
+# This test is marked pending because sbt.globalsettingfix flag is off by default
+# See https://github.com/sbt/sbt/issues/2415
+> name