From c305d33f53ca8416239ea60140480ef0ff76260a Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Sat, 26 Jul 2014 11:45:34 +0800
Subject: [PATCH] update sbt

---
 .travis.yml              | 9 +++------
 project/build.properties | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8edecbe8..0f478c28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,6 @@
 language: scala
-jdk:
-- openjdk6
 scala:
-- 2.9.2
+- 2.10.4
 before_install:
 - sudo apt-get update
 - sudo apt-get install libc6-dev-i386
@@ -17,12 +15,11 @@ before_install:
 - tar xf android-sdk_r23-linux.tgz
 - wget http://dl.google.com/android/ndk/android-ndk-r9d-linux-${ARCH}.tar.bz2
 - tar xf android-ndk-r9d-linux-${ARCH}.tar.bz2
-- export ANDROID_NDK=`pwd`/android-ndk-r9d
+- export ANDROID_NDK_HOME=`pwd`/android-ndk-r9d
 - export ANDROID_HOME=`pwd`/android-sdk-linux
-- export PATH=${PATH}:${ANDROID_NDK}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+- export PATH=${PATH}:${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 - echo "y" | android update sdk --filter tools,platform-tools,build-tools-20.0.0,android-19,extra-google-m2repository --no-ui --no-https -a
 - echo "y" | android update sdk --filter extra-android-m2repository --no-ui --no-https -a
-- ln -s $ANDROID_HOME/build-tools/20.0.0/zipalign $ANDROID_HOME/tools/
 install:
 - gem install --version 0.8.9 faraday
 - gem install travis-artifacts
diff --git a/project/build.properties b/project/build.properties
index 9b860e23..be6c454f 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.3
+sbt.version=0.13.5