From 8665ba0c5f8440632848f39a5ed355bc54782a18 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Tue, 8 Nov 2011 19:16:37 +0100
Subject: [PATCH 1/3] sbt 0.11.1 ; -offline.

---
 sbt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sbt b/sbt
index 561d0b11f..180e2b64c 100755
--- a/sbt
+++ b/sbt
@@ -35,10 +35,10 @@ die() {
 }
 
 # todo - make this dynamic
-declare -r sbt_release_version=0.11.0
+declare -r sbt_release_version=0.11.1
 unset sbt_rc_version
 # declare -r sbt_rc_version=
-declare -r sbt_snapshot_version=0.11.1-SNAPSHOT
+declare -r sbt_snapshot_version=0.11.2-SNAPSHOT
 declare -r sbt_snapshot_baseurl="http://typesafe.artifactoryonline.com/typesafe/ivy-snapshots/org.scala-tools.sbt/sbt-launch/"
 
 declare -r default_java_opts="-Dfile.encoding=UTF8"
@@ -215,6 +215,7 @@ Usage: $script_name [options]
   -ivy      <path>  path to local Ivy repository (default: ~/.ivy2)
   -mem   <integer>  set memory options (default: $sbt_mem, which is $(get_mem_opts $sbt_mem))
   -no-share         use all local caches; no sharing
+  -offline          put sbt in offline mode
 
   # sbt version (default: from project/build.properties if present, else latest release)
   -sbt-version  <version>   use the specified version of sbt
@@ -279,6 +280,7 @@ process_args ()
       -sbt-boot) addJava "-Dsbt.boot.directory=$2"; shift 2 ;;
        -sbt-dir) addJava "-Dsbt.global.base=$2"; shift 2 ;;
      -debug-inc) addJava "-Dxsbt.inc.debug=true"; shift ;;
+       -offline) addSbt "set offline := true"; shift ;;
 
     -sbt-create) sbt_create=true; shift ;;
         -sbt-rc) [[ -n "$sbt_rc_version" ]] || die "no sbt RC candidate defined."; sbt_version=$sbt_rc_version; shift ;;

From 8cf9fa83be66a5cc26faa0c9f61a09120f0af108 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Mon, 28 Nov 2011 17:24:43 -0800
Subject: [PATCH 2/3] Tweaked java_opts, 0.11.2.

---
 sbt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sbt b/sbt
index 180e2b64c..80d78f91d 100755
--- a/sbt
+++ b/sbt
@@ -35,10 +35,10 @@ die() {
 }
 
 # todo - make this dynamic
-declare -r sbt_release_version=0.11.1
+declare -r sbt_release_version=0.11.2
 unset sbt_rc_version
 # declare -r sbt_rc_version=
-declare -r sbt_snapshot_version=0.11.2-SNAPSHOT
+declare -r sbt_snapshot_version=0.11.3-SNAPSHOT
 declare -r sbt_snapshot_baseurl="http://typesafe.artifactoryonline.com/typesafe/ivy-snapshots/org.scala-tools.sbt/sbt-launch/"
 
 declare -r default_java_opts="-Dfile.encoding=UTF8"
@@ -352,9 +352,9 @@ EOM
 
 # run sbt
 execRunner "$java_cmd" \
-  ${java_opts} \
   ${SBT_OPTS:-$default_sbt_opts} \
   $(get_mem_opts $sbt_mem) \
+  ${java_opts} \
   ${java_args[@]} \
   -jar "$sbt_jar" \
   "${sbt_commands[@]}" \

From afccc22f280e9a59fec0b62fff7bd660d13fe915 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Mon, 5 Dec 2011 14:24:04 -0500
Subject: [PATCH 3/3] Calling a directory .sbt in the project/ directory causes
 SBT to go into legacy plugin project mode and breaks version resolution.  
 This fixes that issue by calling the directory .sbtboot instead of .sbt. 
 Note: why are .sbtboot and .boot separate?  A question for others.

---
 sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sbt b/sbt
index 80d78f91d..64bdb5995 100755
--- a/sbt
+++ b/sbt
@@ -44,7 +44,7 @@ declare -r sbt_snapshot_baseurl="http://typesafe.artifactoryonline.com/typesafe/
 declare -r default_java_opts="-Dfile.encoding=UTF8"
 declare -r default_sbt_opts="-XX:+CMSClassUnloadingEnabled"
 declare -r default_sbt_mem=1536
-declare -r noshare_opts="-Dsbt.global.base=project/.sbt -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy"
+declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy"
 declare -r sbt_opts_file=".sbtopts"
 declare -r latest_28="2.8.2"
 declare -r latest_29="2.9.1"