From a50f96c7c46d59cc8c1a5d321f8269da1f89e0cf Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 21 May 2017 13:18:11 -0400 Subject: [PATCH] change EvictionWarningOptions.default Fixes sbt/sbt#3171 change EvictionWarningOptions.default to include transitive evictions and caller info. --- .../librarymanagement/EvictionWarning.scala | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/librarymanagement/src/main/scala/sbt/librarymanagement/EvictionWarning.scala b/librarymanagement/src/main/scala/sbt/librarymanagement/EvictionWarning.scala index eff181a25..1dd049e5b 100644 --- a/librarymanagement/src/main/scala/sbt/librarymanagement/EvictionWarning.scala +++ b/librarymanagement/src/main/scala/sbt/librarymanagement/EvictionWarning.scala @@ -58,11 +58,29 @@ final class EvictionWarningOptions private[sbt] ( object EvictionWarningOptions { def empty: EvictionWarningOptions = - new EvictionWarningOptions(Vector(), false, false, false, false, false, defaultGuess) + new EvictionWarningOptions(Vector(), + warnScalaVersionEviction = false, + warnDirectEvictions = false, + warnTransitiveEvictions = false, + infoAllEvictions = false, + showCallers = false, + defaultGuess) def default: EvictionWarningOptions = - new EvictionWarningOptions(Vector(Compile), true, true, false, false, false, defaultGuess) + new EvictionWarningOptions(Vector(Compile), + warnScalaVersionEviction = true, + warnDirectEvictions = true, + warnTransitiveEvictions = true, + infoAllEvictions = false, + showCallers = true, + defaultGuess) def full: EvictionWarningOptions = - new EvictionWarningOptions(Vector(Compile), true, true, true, true, true, defaultGuess) + new EvictionWarningOptions(Vector(Compile), + warnScalaVersionEviction = true, + warnDirectEvictions = true, + warnTransitiveEvictions = true, + infoAllEvictions = true, + showCallers = true, + defaultGuess) lazy val defaultGuess: Function1[(ModuleID, Option[ModuleID], Option[IvyScala]), Boolean] = guessSecondSegment orElse guessSemVer orElse guessFalse