From 5994a7bec5f5c0b645d672a082bbe54acba2c6b3 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Mon, 6 Jan 2014 09:30:02 -0500
Subject: [PATCH] Upgrade to sbt 0.13.1

---
 project/build.properties      |  2 +-
 project/packaging.scala       | 15 +++------------
 project/project/plugins.scala |  4 ++--
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index 1ced03cad..37b489cb6 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.4-RC1
+sbt.version=0.13.1
diff --git a/project/packaging.scala b/project/packaging.scala
index 6fdb8e7ab..1bc1e2bf8 100644
--- a/project/packaging.scala
+++ b/project/packaging.scala
@@ -9,8 +9,6 @@ object Packaging {
   val sbtLaunchJarLocation = SettingKey[File]("sbt-launch-jar-location")  
   val sbtLaunchJar = TaskKey[File]("sbt-launch-jar", "Resolves SBT launch jar")
   val moduleID = (organization, sbtVersion) apply { (o,v) => ModuleID(o,"sbt",v) }
-  val stagingDirectory = SettingKey[File]("staging-directory")
-  val stage = TaskKey[File]("stage")
 
   def localWindowsPattern = "[organisation]/[module]/[revision]/[module].[ext]"
 
@@ -23,11 +21,11 @@ object Packaging {
     case _                             => "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-tools.sbt/sbt-launch/"+v+"/sbt-launch.jar"
   }
 
-  val settings: Seq[Setting[_]] = packagerSettings ++ deploymentSettings ++ mapGenericFilesToLinux ++ mapGenericFilesToWinows ++ Seq(
+  val settings: Seq[Setting[_]] = packagerSettings ++ deploymentSettings ++ mapGenericFilesToLinux ++ mapGenericFilesToWindows ++ Seq(
     sbtLaunchJarUrl <<= sbtVersion apply downloadUrlForVersion,
     sbtLaunchJarLocation <<= target apply (_ / "sbt-launch.jar"),
     sbtLaunchJar <<= (sbtLaunchJarUrl, sbtLaunchJarLocation) map { (uri, file) =>
-      import dispatch._
+      import dispatch.classic._
       if(!file.exists) {
          // oddly, some places require us to create the file before writing...
          IO.touch(file)
@@ -98,13 +96,6 @@ object Packaging {
     projectID in Debian    <<= moduleID,
     projectID in Windows   <<= moduleID,
     projectID in Rpm       <<= moduleID,
-    projectID in Universal <<= moduleID,
-    stagingDirectory <<= (target) apply { (t) => t / "stage" },
-    stage <<= (stagingDirectory, mappings in Universal) map { (dir, m) =>
-      val files = for((file, name) <- m)
-                  yield file -> (dir / name)
-      IO copy files
-      dir
-    }
+    projectID in Universal <<= moduleID
   )
 }
diff --git a/project/project/plugins.scala b/project/project/plugins.scala
index 73f5ef970..ddc50a0f4 100644
--- a/project/project/plugins.scala
+++ b/project/project/plugins.scala
@@ -6,8 +6,8 @@ object PluginBuild extends Build {
   
   val root = Project("root", file(".")) settings(
     resolvers += Resolver.url("scalasbt", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns),
-    addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.6.0-symlink-3"),
-    libraryDependencies += "net.databinder" % "dispatch-http_2.9.1" % "0.8.6"
+    addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.6.3"),
+    libraryDependencies += "net.databinder" %% "dispatch-http" % "0.8.10"
   ) //dependsOn(nativePackager)