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

Merge pull request #179 from xuwei-k/issue-178 

fix incorrect eviction warning message
This commit is contained in:
Dale Wijnand 2017-11-06 08:46:24 +00:00 committed by GitHub
parent 91b56c50db a385a13fa5
commit 19054834b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/scala/sbt/librarymanagement/EvictionWarning.scala
View File

@ -283,7 +283,7 @@ object EvictionWarning {
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) }"
out += "\tscalaModuleInfo ~= (_.map(_.withOverrideScalaVersion(true)))"
}
if (a.directEvictions.nonEmpty || a.transitiveEvictions.nonEmpty) {

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

@ -93,7 +93,7 @@ class EvictionWarningSpec extends BaseIvySpecification {
"\t* org.scala-lang:scala-library:2.10.3 is selected over 2.10.2",
"",
"To force scalaVersion, add the following:",
"\tivyScala := ivyScala.value map { _.copy(overrideScalaVersion = true) }",
"\tscalaModuleInfo ~= (_.map(_.withOverrideScalaVersion(true)))",
"Run 'evicted' to see detailed eviction warnings"
)
}
@ -109,7 +109,7 @@ class EvictionWarningSpec extends BaseIvySpecification {
"\t +- com.example:foo:0.1.0 (depends on 2.10.2)",
"",
"To force scalaVersion, add the following:",
"\tivyScala := ivyScala.value map { _.copy(overrideScalaVersion = true) }",
"\tscalaModuleInfo ~= (_.map(_.withOverrideScalaVersion(true)))",
"Run 'evicted' to see detailed eviction warnings"
)
}