From b4a54f18bde00ddaeba91dcd0a5442b66c7c4a1a Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Fri, 31 Aug 2012 14:20:36 -0400
Subject: SBT build now works with SBT 0.12.

Also fixed partest explosion that happened after partest redesign.
---
 project/Build.scala         |  2 +-
 project/Partest.scala       | 10 +++++-----
 project/plugins.sbt         |  2 +-
 project/project/Build.scala |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'project')

diff --git a/project/Build.scala b/project/Build.scala
index 58d322108b..d8468032ef 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -215,7 +215,7 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
 
   lazy val scalacheck = Project("scalacheck", file(".")) settings(compilerDependentProjectSettings:_*) dependsOn(actors % "provided")
   lazy val partestSettings = compilerDependentProjectSettings :+ externalDeps
-  lazy val partest = Project("partest", file(".")) settings(partestSettings:_*)  dependsOn(actors,forkjoin,scalap)
+  lazy val partest = Project("partest", file(".")) settings(partestSettings:_*)  dependsOn(actors,forkjoin,scalap,asm)
   lazy val scalapSettings = compilerDependentProjectSettings ++ Seq(
     name := "scalap",
     exportJars := true
diff --git a/project/Partest.scala b/project/Partest.scala
index bbc160a41d..fbb0a2a980 100644
--- a/project/Partest.scala
+++ b/project/Partest.scala
@@ -58,8 +58,8 @@ object partest {
     val results = runner run Array(testArgs ++ extraArgs ++ extras: _*) asScala
     // TODO - save results
     val failures = results collect {
-      case (path, 1) => path + " [FAILED]"
-      case (path, 2) => path + " [TIMEOUT]"
+      case (path, "FAIL") => path + " [FAILED]"
+      case (path, "TIMEOUT") => path + " [TIMEOUT]"
     }
 
     if (failures.isEmpty)
@@ -115,7 +115,7 @@ object partest {
     }
   }
 
-  def partestRunnerTask(classpath: ScopedTask[Classpath], javacOptions: SettingKey[Seq[String]]): Project.Initialize[Task[PartestRunner]] =
+  def partestRunnerTask(classpath: ScopedTask[Classpath], javacOptions: TaskKey[Seq[String]]): Project.Initialize[Task[PartestRunner]] =
    (classpath, javacOptions) map ((cp, opts) => new PartestRunner(Build.data(cp), opts mkString " "))
 }
 
@@ -128,11 +128,11 @@ class PartestRunner(classpath: Seq[File], javaOpts: String) {
     (c,m)
   }
   lazy val classPathArgs = Seq("-cp", classpath.map(_.getAbsoluteFile).mkString(java.io.File.pathSeparator))
-  def run(args: Array[String]): java.util.Map[String,Int] = try {
+  def run(args: Array[String]): java.util.Map[String,String] = try {
     // TODO - undo this settings after running.  Also globals are bad.
     System.setProperty("partest.java_opts", javaOpts)
     val allArgs = (classPathArgs ++ args).toArray
-    mainMethod.invoke(null, allArgs).asInstanceOf[java.util.Map[String,Int]]
+    mainMethod.invoke(null, allArgs).asInstanceOf[java.util.Map[String,String]]
   } catch {
     case e =>
     //error("Could not run Partest: " + e)
diff --git a/project/plugins.sbt b/project/plugins.sbt
index b49ece7527..fdf37e31a6 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -4,6 +4,6 @@ resolvers += Resolver.url("scalasbt", new URL("http://scalasbt.artifactoryonline
 
 resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven"
 
-libraryDependencies += "net.databinder" %% "dispatch-http" % "0.8.6"
+libraryDependencies += "net.databinder" % "dispatch-http_2.9.1" % "0.8.6"
 
 
diff --git a/project/project/Build.scala b/project/project/Build.scala
index bd1250fc39..902e8b0fb3 100644
--- a/project/project/Build.scala
+++ b/project/project/Build.scala
@@ -2,6 +2,6 @@ import sbt._
 object PluginDef extends Build {
   override def projects = Seq(root)
   lazy val root = Project("plugins", file(".")) dependsOn(proguard, git)
-  lazy val proguard = uri("git://github.com/jsuereth/xsbt-proguard-plugin.git#sbt-0.11")
+  lazy val proguard = uri("git://github.com/jsuereth/xsbt-proguard-plugin.git#sbt-0.12")
   lazy val git = uri("git://github.com/sbt/sbt-git-plugin.git#scala-build")
 }
-- 
cgit v1.2.3