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

Merge pull request #1498 from sbt/wip/fix-broken-cross 

Fix broken cross versioning semantics using +
This commit is contained in:
eugene yokota 2014-08-04 17:38:34 -04:00
parent 9654b2a658 19b91396a2
commit cd40f05085
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/src/main/scala/sbt/Cross.scala
View File

@ -74,7 +74,9 @@ object Cross {
case x if exclude(x) => delegateToGlobal(x.key)
}
val fixedSession = session.appendRaw(add ++ delegates)
BuiltinCommands.reapply(fixedSession, structure, state)
val fixedState = BuiltinCommands.reapply(fixedSession, structure, state)
if (!command.isEmpty) command :: fixedState
else fixedState
}
// Creates a delegate for a scoped key that pulls the setting from the global scope.
@ -98,7 +100,10 @@ object Cross {
import x._
val versions = crossVersions(state)
val current = scalaVersion in currentRef get structure.data map (SwitchCommand + " " + _) toList;
if (versions.isEmpty) command :: state else versions.map(SwitchCommand + " " + _ + " " + command) ::: current ::: state
if (versions.isEmpty) command :: state
else {
versions.map(v => s"$SwitchCommand $v $command") ::: current ::: state
}
}
def crossVersions(state: State): Seq[String] =
{