From e346aa45a8518a7d03d9b832309baa83fecd8a6a Mon Sep 17 00:00:00 2001
From: "P. Oscar Boykin" <oscar@twitter.com>
Date: Wed, 19 Nov 2014 08:18:25 -0800
Subject: [PATCH] Update to sbt 0.13.7 and cached resolution

---
 project/Build.scala      | 12 +++++++-----
 project/build.properties |  2 +-
 sbt                      |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/project/Build.scala b/project/Build.scala
index 0dd6cf95a9..7296642708 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -13,7 +13,7 @@ import scala.collection.JavaConverters._
 
 object ScaldingBuild extends Build {
 
-  def scalaBinaryVersion(scalaVersion: String) = scalaVersion match {    
+  def scalaBinaryVersion(scalaVersion: String) = scalaVersion match {
     case version if version startsWith "2.9" => "2.9"
     case version if version startsWith "2.10" => "2.10"
   }
@@ -114,6 +114,8 @@ object ScaldingBuild extends Build {
       }
     },
 
+    updateOptions := updateOptions.value.withCachedResolution(true),
+
     pomExtra := (
       <url>https://github.com/twitter/scalding</url>
         <licenses>
@@ -273,10 +275,10 @@ object ScaldingBuild extends Build {
       "org.scala-tools.testing" %% "specs" % "1.6.9" % "test"
     )
   ).dependsOn(scaldingCore)
-  
+
   def scaldingParquetScroogeDeps(version: String) = {
-    if (scalaBinaryVersion(version) == "2.9") 
-      Seq() 
+    if (scalaBinaryVersion(version) == "2.9")
+      Seq()
     else
       Seq(
         "com.twitter" % "parquet-cascading" % "1.6.0rc2",
@@ -288,7 +290,7 @@ object ScaldingBuild extends Build {
         "org.scala-tools.testing" %% "specs" % "1.6.9" % "test"
       )
   }
-  
+
   lazy val scaldingParquetScrooge = module("parquet-scrooge").settings(
     skip in compile := scalaBinaryVersion(scalaVersion.value) == "2.9",
     skip in test := scalaBinaryVersion(scalaVersion.value) == "2.9",
diff --git a/project/build.properties b/project/build.properties
index be6c454fba..748703f770 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.5
+sbt.version=0.13.7
diff --git a/sbt b/sbt
index 25cd36d65c..684e07dc4d 100755
--- a/sbt
+++ b/sbt
@@ -4,7 +4,7 @@
 # Author: Paul Phillips <paulp@typesafe.com>
 
 # todo - make this dynamic
-declare -r sbt_release_version="0.13.5"
+declare -r sbt_release_version="0.13.7"
 declare -r sbt_unreleased_version="0.13.6-MSERVER-1"
 declare -r buildProps="project/build.properties"
 
@@ -454,4 +454,4 @@ execRunner "$java_cmd" \
   "${java_args[@]}" \
   -jar "$sbt_jar" \
   "${sbt_commands[@]}" \
-  "${residual_args[@]}"
\ No newline at end of file
+  "${residual_args[@]}"