Merge pull request #40 from JamesEarlDouglas/master

upgrade sbt from 0.11.0 to 0.11.2

project/plugins/plugins.sbt → project/plugins.sbt

@@ -1,9 +1,9 @@
 
-// libraryDependencies <+= sbtVersion(v => "com.github.siasia" %% "xsbt-proguard-plugin" % (v+"-0.1.1"))
+libraryDependencies <+= sbtVersion(v => "com.github.siasia" %% "xsbt-proguard-plugin" % (v+"-0.1.1"))
 
 resolvers += "Proguard plugin repo" at "http://siasia.github.com/maven2"
 
-addSbtPlugin("com.github.siasia" % "xsbt-proguard-plugin" % "0.1-SNAPSHOT")
+// addSbtPlugin("com.github.siasia" % "xsbt-proguard-plugin" % "0.1-SNAPSHOT")
 
 // resolvers += "retronym-releases" at "http://retronym.github.com/repo/releases"
 // resolvers += "retronym-snapshots" at "http://retronym.github.com/repo/snapshots"

sbt

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-java $SBT_OPTS -Dfile.encoding=UTF-8 -Xss4M -Xmx1200M -XX:MaxPermSize=512M -XX:NewSize=128M -XX:NewRatio=3 -jar `dirname $0`/project/sbt-launch-0.11.0.jar "$@"
+java $SBT_OPTS -Dfile.encoding=UTF-8 -Xss4M -Xmx1200M -XX:MaxPermSize=512M -XX:NewSize=128M -XX:NewRatio=3 -jar `dirname $0`/project/sbt-launch-0.11.2.jar "$@"

sbt.cmd

@@ -1,2 +1,2 @@
 set SCRIPT_DIR=%~dp0
-java %SBT_OPTS% -Dfile.encoding=UTF-8 -Xss4M -Xmx1200M -XX:MaxPermSize=512M -XX:NewSize=128M -XX:NewRatio=3 -jar "%SCRIPT_DIR%\project\sbt-launch-0.11.0.jar" %*
+java %SBT_OPTS% -Dfile.encoding=UTF-8 -Xss4M -Xmx1200M -XX:MaxPermSize=512M -XX:NewSize=128M -XX:NewRatio=3 -jar "%SCRIPT_DIR%\project\sbt-launch-0.11.2.jar" %*