From e39edcce60d1f54c0d4133fe1f755d2e0445971d Mon Sep 17 00:00:00 2001
From: Ismael Juma <ismael@juma.me.uk>
Date: Mon, 26 Sep 2011 22:24:29 +0100
Subject: Upgrade to SBT 0.11.0.

---
 project/build.properties  |  2 +-
 project/plugins/build.sbt | 19 +++++++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'project')

diff --git a/project/build.properties b/project/build.properties
index f47a3009ec..f2ccdfa377 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.10.1
+sbt.version=0.11.0
diff --git a/project/plugins/build.sbt b/project/plugins/build.sbt
index 1e4d170f0e..4bfc7f2af5 100644
--- a/project/plugins/build.sbt
+++ b/project/plugins/build.sbt
@@ -1,15 +1,10 @@
-resolvers += {
-  val typesafeRepoUrl = new java.net.URL("http://repo.typesafe.com/typesafe/releases")
-  val pattern = Patterns(false, "[organisation]/[module]/[sbtversion]/[revision]/[type]s/[module](-[classifier])-[revision].[ext]")
-  Resolver.url("Typesafe Repository", typesafeRepoUrl)(pattern)
-}
+resolvers ++= Seq(
+  "sbt-idea-repo" at "http://mpeltonen.github.com/maven/",
+  Classpaths.typesafeResolver
+)
 
-resolvers += "sbt-idea-repo" at "http://mpeltonen.github.com/maven/"
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "0.11.0-SNAPSHOT")
 
-libraryDependencies += "com.github.mpeltonen" %% "sbt-idea" % "0.10.0"
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse" % "1.4.0")
 
-libraryDependencies <<= (libraryDependencies, sbtVersion) { (deps, version) =>
-  deps :+ ("com.typesafe.sbteclipse" %% "sbteclipse" % "1.2" extra("sbtversion" -> version))
-}
-
-libraryDependencies <+= (sbtVersion) { sv => "com.eed3si9n" %% "sbt-assembly" % ("sbt" + sv + "_0.6") }
+addSbtPlugin("com.eed3si9n" %% "sbt-assembly" % "0.6")
-- 
cgit v1.2.3