taking care of deprecations removed in Scala master

util/collection/IDSet.scala

@@ -37,7 +37,7 @@ object IDSet
 		def += (t: T) = backing.put(t, Dummy)
 		def ++=(t: Iterable[T]) = t foreach +=
 		def -= (t:T) = if(backing.remove(t) eq null) false else true
-		def all = collection.JavaConversions.asScalaIterable(backing.keySet)
+		def all = collection.JavaConversions.collectionAsScalaIterable(backing.keySet)
 		def isEmpty = backing.isEmpty
 		def process[S](t: T)(ifSeen: S)(ifNew: => S) = if(contains(t)) ifSeen else { this += t ; ifNew }
 		override def toString = backing.toString

util/collection/Util.scala

@@ -5,6 +5,8 @@ package sbt
 
 object Util
 {
+	def makeList[T](size: Int, value: T): List[T] = List.fill(size)(value)
+
 	def separateE[A,B](ps: Seq[Either[A,B]]): (Seq[A], Seq[B]) =
 		separate(ps)(Types.idFun)
 

util/complete/JLineCompletion.scala

@@ -131,7 +131,7 @@ object JLineCompletion
 			if(line.charAt(line.length - 1) != '\n')
 				reader.printNewline()
 		}
-		reader.printColumns(JavaConversions.asJavaList(columns.map(_.trim)))
+		reader.printColumns(JavaConversions.seqAsJavaList(columns.map(_.trim)))
 	}
 	def hasNewline(s: String): Boolean = s.indexOf('\n') >= 0
 	def shouldPrint(cs: Seq[String], reader: ConsoleReader): Boolean =

util/complete/Parser.scala

@@ -5,7 +5,7 @@ package sbt.complete
 
 	import Parser._
 	import sbt.Types.{const, left, right, some}
-	import sbt.Util.separate
+	import sbt.Util.{makeList,separate}
 
 sealed trait Parser[+T]
 {
@@ -676,7 +676,7 @@ private final class Repeat[T](partial: Option[Parser[T]], repeated: Parser[T], m
 		else
 			// forced determinism
 			for(value <- repeated.resultEmpty) yield
-				List.make(min, value)
+				makeList(min, value)
 	}
 	override def toString = "repeat(" + min + "," + max +"," + partial + "," + repeated + ")"
 }