From 042128a6734bf204197ce260b97e2ffcb583f10a Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Thu, 14 Mar 2013 14:14:47 -0400 Subject: [PATCH] Put default conflict warnings at the debug level. Fixes #709. This is at debug instead of disabled so as to be a minimal change during a point release. It is dropped to debug because the conflict warnings don't work correctly, especially for the artifacts they were designed for, sbt and Scala. This is due to the overrides and excludes present in 0.12.x. The other possible use of conflictWarning is for general libraries, but in 0.13 that is better served by using a strict conflict manager. Therefore, 0.13 should drop the warnings based on the evicted modules completely. --- main/Defaults.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/Defaults.scala b/main/Defaults.scala index 0e64b1b3a..cc7adfecf 100755 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -768,7 +768,7 @@ object Classpaths publishLocal <<= publishTask(publishLocalConfiguration, deliverLocal) ) val baseSettings: Seq[Setting[_]] = sbtClassifiersTasks ++ Seq( - conflictWarning in GlobalScope :== ConflictWarning.default("global"), + conflictWarning in GlobalScope :== ConflictWarning.default("global").copy(level = Level.Debug), conflictWarning <<= (thisProjectRef, conflictWarning) { (ref, cw) => cw.copy(label = Project.display(ref)) }, unmanagedBase <<= baseDirectory / "lib", normalizedName <<= name(StringUtilities.normalize),