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

Merge pull request #2833 from dwijnand/fport-floaty-commmits 

[1.0] Foward port floaty commits
This commit is contained in:
eugene yokota 2016-11-16 11:56:26 -05:00 committed by GitHub
parent 4765990995 1fa63b64e0
commit 94c67d9d7a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project/Transform.scala
View File

@ -27,7 +27,7 @@ object Transform {
{
IO.delete(conscriptBase)
val pairs = Seq(
"sbt.xMain" -> "sbt",
"sbt.xMain" -> "xsbt",
"sbt.ScriptMain" -> "scalas",
"sbt.ConsoleMain" -> "screpl"
)

4
project/Util.scala
View File

@ -14,8 +14,8 @@ object Util {
def crossBuild: Seq[Setting[_]] =
Seq(
crossPaths := (scalaBinaryVersion.value match {
case "2.11" => true
case _ => false
case "2.10" => false
case _ => true
})
)