Bump version

madeye · madeye · commit 1c67b39a3e24 · 2016-09-04T10:31:33.000+08:00
diff --git a/kcptun/kcptun b/kcptun/kcptun
@@ -1 +1 @@
-Subproject commit 91b2c650d128285f8a5f8305696d4c5ccdbe8e5f
+Subproject commit e44d8c9041b0f8825295bca089ff3dbad294508c
diff --git 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
@@ -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
@@ -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"/>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.15")`
	`1`	`+addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.16")`
`2`	`2`
`3`	`3`	`addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10")`
`4`	`4`