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

Update to 2.10.1-RC1 

Needed an explicit type in PMap to workaround an error.
Need to drop tuple assignment of parser.parsed in input task macro as a workaround
  for macro/resetAllAttrs/pattern matching/annotation issue in RC1.
This commit is contained in:
Mark Harrah 2013-02-13 03:25:13 -05:00
parent 7a3a8bb50b
commit 76e0a941ba
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -421,7 +421,9 @@ object Defaults extends BuildCommon
{
val parser = loadForParser(definedTestNames)( (s, i) => testOnlyParser(s, i getOrElse Nil) )
Def.inputTaskDyn {
val (selected, frameworkOptions) = parser.parsed
val res = parser.parsed
val selected = res._1
val frameworkOptions = res._2
val s = streams.value
val filter = testFilter.value
val config = testExecution.value
@ -573,7 +575,9 @@ object Defaults extends BuildCommon
import DefaultParsers._
val parser = loadForParser(discoveredMainClasses)( (s, names) => runMainParser(s, names getOrElse Nil) )
Def.inputTask {
val (mainClass, args) = parser.parsed
val res = parser.parsed
val mainClass = res._1
val args = res._2
toError(scalaRun.value.run(mainClass, data(classpath.value), args, streams.value.log))
}
}

2
project/Sbt.scala
View File

@ -16,7 +16,7 @@ object Sbt extends Build
organization := "org.scala-sbt",
version := "0.13.0-SNAPSHOT",
publishArtifact in packageDoc := false,
scalaVersion := "2.10.0",
scalaVersion := "2.10.1-RC1",
publishMavenStyle := false,
componentID := None,
crossPaths := false,

3
util/collection/src/main/scala/sbt/PMap.scala
View File

@ -3,7 +3,6 @@
*/
package sbt
import Types._
import collection.mutable
trait RMap[K[_], V[_]]
@ -12,7 +11,7 @@ trait RMap[K[_], V[_]]
def get[T](k: K[T]): Option[V[T]]
def contains[T](k: K[T]): Boolean
def toSeq: Seq[(K[_], V[_])]
def toTypedSeq = toSeq.map{ case (k: K[t],v) => TPair[t](k,v.asInstanceOf[V[t]]) }
def toTypedSeq: Seq[TPair[_]] = toSeq.map{ case (k: K[t],v) => TPair[t](k,v.asInstanceOf[V[t]]) }
def keys: Iterable[K[_]]
def values: Iterable[V[_]]
def isEmpty: Boolean