From 51728d1ad17fab21a3bc561ead8922b7b600d9ab Mon Sep 17 00:00:00 2001 From: jozic Date: Wed, 13 Feb 2013 15:03:31 -0500 Subject: [PATCH] switch dispatch to dispatch.classic to avoid collisions with plugins which use newer versions of dispatch (0.9+) --- project/Release.scala | 4 ++-- project/p.sbt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project/Release.scala b/project/Release.scala index 1d1aaf373..b268bc9fb 100644 --- a/project/Release.scala +++ b/project/Release.scala @@ -43,8 +43,8 @@ object Release extends Build def deployLauncher(launcher: ScopedTask[File]) = (launcher, launcherRemotePath, credentials, remoteBase, streams) map { (launchJar, remotePath, creds, base, s) => val (uname, pwd) = getCredentials(creds, s.log) - val request = dispatch.url(base) / remotePath <<< (launchJar, BinaryType) as (uname, pwd) - val http = new dispatch.Http + val request = dispatch.classic.url(base) / remotePath <<< (launchJar, BinaryType) as (uname, pwd) + val http = new dispatch.classic.Http try { http(request.as_str) } finally { http.shutdown() } } def getCredentials(cs: Seq[Credentials], log: Logger): (String, String) = diff --git a/project/p.sbt b/project/p.sbt index ce154aae1..65a76b635 100644 --- a/project/p.sbt +++ b/project/p.sbt @@ -1,5 +1,5 @@ libraryDependencies ++= Seq( - "net.databinder" %% "dispatch-http" % "0.8.8", + "net.databinder" %% "dispatch-http" % "0.8.9", "org.jsoup" % "jsoup" % "1.7.1" )