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

Exempt scala-actors-migration from version checks. 

Fixes #1818.
This commit is contained in:
Dale Wijnand 2015-03-04 07:45:00 +00:00
parent d7543f0b91
commit 77898b67bc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ivy/src/main/scala/sbt/IvyScala.scala
View File

@ -66,7 +66,11 @@ private object IvyScala {
{
val id = dep.getDependencyRevisionId
val depBinaryVersion = CrossVersion.binaryScalaVersion(id.getRevision)
val mismatched = id.getOrganisation == Organization && depBinaryVersion != scalaBinaryVersion && dep.getModuleConfigurations.exists(configSet)
def isScalaLangOrg = id.getOrganisation == Organization
def isNotScalaActorsMigration = !(id.getName startsWith "scala-actors-migration") // Exception to the rule: sbt/sbt#1818
def hasBinVerMismatch = depBinaryVersion != scalaBinaryVersion
def matchesOneOfTheConfigs = dep.getModuleConfigurations.exists(configSet)
val mismatched = isScalaLangOrg && isNotScalaActorsMigration && hasBinVerMismatch && matchesOneOfTheConfigs
if (mismatched)
Some("Binary version (" + depBinaryVersion + ") for dependency " + id +
"\n\tin " + module.getModuleRevisionId +
@ -111,4 +115,4 @@ private object IvyScala {
configurationNames.foreach(rule.addConfiguration)
rule
}
}
}