From 36438d2ac31d0e89348dafd21f9e924553a6cbe7 Mon Sep 17 00:00:00 2001
From: exoego <mogami@exoego.net>
Date: Thu, 15 Feb 2018 22:33:11 +0900
Subject: [PATCH 1/2] Add eviction warnings options to global

---
 main/src/main/scala/sbt/Defaults.scala        | 3 ++-
 notes/1.2.0/global-eviction-warnin-options.md | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 notes/1.2.0/global-eviction-warnin-options.md

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index aba681b1a..2ab1b4259 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -1753,6 +1753,7 @@ object Classpaths {
     Defaults.globalDefaults(
       Seq(
         conflictWarning :== ConflictWarning.default("global"),
+        evictionWarningOptions := EvictionWarningOptions.default,
         compatibilityWarningOptions :== CompatibilityWarningOptions.default,
         homepage :== None,
         startYear :== None,
@@ -1988,7 +1989,6 @@ object Classpaths {
       val suffix = if (crossPaths.value) s"_$binVersion" else ""
       s"update_cache$suffix"
     },
-    evictionWarningOptions in update := EvictionWarningOptions.default,
     dependencyPositions := dependencyPositionsTask.value,
     unresolvedWarningConfiguration in update := UnresolvedWarningConfiguration(
       dependencyPositions.value),
@@ -1999,6 +1999,7 @@ object Classpaths {
       ConflictWarning(conflictWarning.value, report, log)
       report
     },
+    evictionWarningOptions in update := (evictionWarningOptions in GlobalScope).value,
     evictionWarningOptions in evicted := EvictionWarningOptions.full,
     evicted := {
       import ShowLines._
diff --git a/notes/1.2.0/global-eviction-warnin-options.md b/notes/1.2.0/global-eviction-warnin-options.md
new file mode 100644
index 000000000..981bc2477
--- /dev/null
+++ b/notes/1.2.0/global-eviction-warnin-options.md
@@ -0,0 +1,3 @@
+### Improvements
+
+- Add the eviction warning options to global, so that one can change the options for all sub projects at a time.

From dc4f93a7c3ecf2e2491aceaaecdbcec8fc8f7df9 Mon Sep 17 00:00:00 2001
From: exoego <mogami@exoego.net>
Date: Thu, 8 Mar 2018 08:14:39 +0900
Subject: [PATCH 2/2] Remove unnecessary GlobalScope

---
 main/src/main/scala/sbt/Defaults.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 2ab1b4259..b48c007f2 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -1999,7 +1999,7 @@ object Classpaths {
       ConflictWarning(conflictWarning.value, report, log)
       report
     },
-    evictionWarningOptions in update := (evictionWarningOptions in GlobalScope).value,
+    evictionWarningOptions in update := evictionWarningOptions.value,
     evictionWarningOptions in evicted := EvictionWarningOptions.full,
     evicted := {
       import ShowLines._