luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #1201. Display instruction to overrideScalaVersion 

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.
This commit is contained in:
Eugene Yokota 2014-08-18 00:54:19 -04:00
parent 05c77ae1e9
commit 676e95eaee
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ivy/src/main/scala/sbt/EvictionWarning.scala
View File

@ -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) {

6
ivy/src/test/scala/EvictionWarningSpec.scala
View File

@ -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)