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

Pull sbt dependency version from sbtVersion to facilitate cross-building plugins.

This commit is contained in:
Mark Harrah 2013-05-30 15:00:26 -04:00
parent ea52e2c034
commit 431a0be42d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/scala/sbt/Defaults.scala
View File

@ -1018,7 +1018,7 @@ object Classpaths
val scalaVersion = app.provider.scalaProvider.version val scalaVersion = app.provider.scalaProvider.version
val binVersion = binaryScalaVersion(scalaVersion) val binVersion = binaryScalaVersion(scalaVersion)
val cross = if(id.crossVersioned) CrossVersion.binary else CrossVersion.Disabled val cross = if(id.crossVersioned) CrossVersion.binary else CrossVersion.Disabled
val base = ModuleID(id.groupID, id.name, id.version, crossVersion = cross) val base = ModuleID(id.groupID, id.name, sbtVersion.value, crossVersion = cross)
CrossVersion(scalaVersion, binVersion)(base).copy(crossVersion = CrossVersion.Disabled) CrossVersion(scalaVersion, binVersion)(base).copy(crossVersion = CrossVersion.Disabled)
} }
) )