From 3c9194566e2f4e835c9308f4632a7dc47b85514c Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Sun, 4 Sep 2016 10:31:33 +0800
Subject: [PATCH] Bump version

---
 kcptun/kcptun                | 2 +-
 kcptun/make.bash             | 1 +
 project/plugins.sbt          | 2 +-
 src/main/AndroidManifest.xml | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/kcptun/kcptun b/kcptun/kcptun
index 91b2c650d1..e44d8c9041 160000
--- a/kcptun/kcptun
+++ b/kcptun/kcptun
@@ -1 +1 @@
-Subproject commit 91b2c650d128285f8a5f8305696d4c5ccdbe8e5f
+Subproject commit e44d8c9041b0f8825295bca089ff3dbad294508c
diff --git a/kcptun/make.bash b/kcptun/make.bash
index 3990d12a45..4240dbb311 100755
--- a/kcptun/make.bash
+++ b/kcptun/make.bash
@@ -52,6 +52,7 @@ pushd kcptun/client
 
 echo "Get dependences for kcptun"
 go get -u github.com/xtaci/kcp-go
+go get -u github.com/xtaci/smux
 go get
 
 echo "Cross compile kcptun for arm"
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 3ee67d671a..0467852e81 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.15")
+addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.16")
 
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10")
 
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 069c34d17b..389cfe356c 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks"
-          android:versionCode="150"
-          android:versionName="3.0.8">
+          android:versionCode="151"
+          android:versionName="3.1.0">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>