Merge pull request #1 from bmjames/master

Upgrade SBT to 0.11.2

project/plugins/build.sbt

@@ -1,12 +1,13 @@
 resolvers ++= Seq(
   "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases",
-  "Siasia Repository" at "http://siasia.github.com/maven2"
+  "spray repo" at "http://repo.spray.cc"
 )
 
-addSbtPlugin("com.github.siasia" % "xsbt-web-plugin" % "0.1.2")
+libraryDependencies <+= sbtVersion(v => "com.github.siasia" %% "xsbt-web-plugin" % (v+"-0.2.11"))
 
-addSbtPlugin("com.typesafe.sbtscalariform" % "sbt-scalariform" % "0.1.4")
+addSbtPlugin("com.typesafe.sbtscalariform" % "sbtscalariform" % "0.3.0")
 
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.7.1")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.7.4")
+
+addSbtPlugin("com.eed3si9n" % "sbt-appengine" % "0.4.0")
 
-addSbtPlugin("com.eed3si9n" % "sbt-appengine" % "0.3.0")

sbt

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 java -Xmx2048M -XX:MaxPermSize=512m \
-    -jar `dirname $0`/dev/sbt-launch-0.11.0.jar "$@"
+    -jar `dirname $0`/dev/sbt-launch-0.11.2.jar "$@"

sbt-tc

@@ -4,5 +4,5 @@ cat /dev/null | java -Xmx1G -XX:MaxPermSize=250m \
     -Dsbt.log.noformat=true \
     -Dbuild.number="$BUILD_NUMBER" \
     -Dbuild.vcs.number="$BUILD_VCS_NUMBER" \
-    -jar dev/sbt-launch-0.11.0.jar "$@"
+    -jar dev/sbt-launch-0.11.2.jar "$@"