From 76e0a941ba55b0b5936bcfc74bc777e35ea48ef4 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Wed, 13 Feb 2013 03:25:13 -0500 Subject: [PATCH] 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. --- main/src/main/scala/sbt/Defaults.scala | 8 ++++++-- project/Sbt.scala | 2 +- util/collection/src/main/scala/sbt/PMap.scala | 3 +-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index dec0785b5..aa70c9b99 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -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)) } } diff --git a/project/Sbt.scala b/project/Sbt.scala index 4aaec1a00..81235302b 100644 --- a/project/Sbt.scala +++ b/project/Sbt.scala @@ -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, diff --git a/util/collection/src/main/scala/sbt/PMap.scala b/util/collection/src/main/scala/sbt/PMap.scala index 8b1772220..9cf7f26f2 100644 --- a/util/collection/src/main/scala/sbt/PMap.scala +++ b/util/collection/src/main/scala/sbt/PMap.scala @@ -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