From 8c90e7eb74add83d1d12cfd81078417e17499256 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 18 Aug 2014 00:54:19 -0400
Subject: [PATCH] Fixes #1201. Display instruction to overrideScalaVersion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

scala-library is currently treated as just one of the library modules.
This means that it’s at the mercy of eviction if some other library
uses newer version of scala-library.
This commit displays a instruction on how to force scalaVersion if
warnScalaVersionEviction flag is true on EvictionWarningOptions.
---
 ivy/src/main/scala/sbt/EvictionWarning.scala | 5 ++++-
 ivy/src/test/scala/EvictionWarningSpec.scala | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ivy/src/main/scala/sbt/EvictionWarning.scala b/ivy/src/main/scala/sbt/EvictionWarning.scala
index da121e0fa..c40860081 100644
--- a/ivy/src/main/scala/sbt/EvictionWarning.scala
+++ b/ivy/src/main/scala/sbt/EvictionWarning.scala
@@ -2,6 +2,7 @@ package sbt
 
 import collection.mutable
 import Configurations.Compile
+import ScalaArtifacts.{ LibraryID, CompilerID }
 
 final class EvictionWarningOptions private[sbt] (
     val configurations: Seq[Configuration],
@@ -130,7 +131,7 @@ object EvictionWarning {
     module.moduleSettings.ivyScala match {
       case Some(s) =>
         organization == s.scalaOrganization &&
-          (name == "scala-library") || (name == "scala-compiler")
+          (name == LibraryID) || (name == CompilerID)
       case _ => false
     }
 
@@ -182,6 +183,8 @@ object EvictionWarning {
     if (!a.scalaEvictions.isEmpty) {
       out += "Scala version was updated by one of library dependencies:"
       out ++= (a.scalaEvictions flatMap { _.lines })
+      out += "To force scalaVersion, add the following:"
+      out += "\tivyScala := ivyScala.value map { _.copy(overrideScalaVersion = true) }"
     }
 
     if (!a.directEvictions.isEmpty || !a.transitiveEvictions.isEmpty) {
diff --git a/ivy/src/test/scala/EvictionWarningSpec.scala b/ivy/src/test/scala/EvictionWarningSpec.scala
index 171d60bd5..0e1e3dd2c 100644
--- a/ivy/src/test/scala/EvictionWarningSpec.scala
+++ b/ivy/src/test/scala/EvictionWarningSpec.scala
@@ -86,6 +86,8 @@ class EvictionWarningSpec extends BaseIvySpecification {
     EvictionWarning(m, defaultOptions, report, log).lines must_==
       List("Scala version was updated by one of library dependencies:",
         "\t* org.scala-lang:scala-library:2.10.2 -> 2.10.3",
+        "To force scalaVersion, add the following:",
+        "\tivyScala := ivyScala.value map { _.copy(overrideScalaVersion = true) }",
         "Run 'evicted' to see detailed eviction warnings")
   }
 
@@ -94,7 +96,9 @@ class EvictionWarningSpec extends BaseIvySpecification {
     val report = ivyUpdate(m)
     EvictionWarning(m, defaultOptions.withShowCallers(true), report, log).lines must_==
       List("Scala version was updated by one of library dependencies:",
-        "\t* org.scala-lang:scala-library:2.10.2 -> 2.10.3 (caller: com.typesafe.akka:akka-actor_2.10:2.3.0, com.example:foo:0.1.0)")
+        "\t* org.scala-lang:scala-library:2.10.2 -> 2.10.3 (caller: com.typesafe.akka:akka-actor_2.10:2.3.0, com.example:foo:0.1.0)",
+        "To force scalaVersion, add the following:",
+        "\tivyScala := ivyScala.value map { _.copy(overrideScalaVersion = true) }")
   }
 
   def javaLibDirectDeps = Seq(commonsIo14, commonsIo24)