Bump version

Merge branch 'master' of github.com:shadowsocks/shadowsocks-android
Update kcptun
2016-09-04 10:31:33 +08:00 · 2016-09-04 10:19:15 +08:00 · 2016-08-28 18:11:29 +08:00
4 changed files with 5 additions and 4 deletions
@@ -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"
@@ -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")

@@ -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"/>
Author	SHA1	Message	Date
Max Lv	1c67b39a3e	Bump version	2016-09-04 10:31:33 +08:00
Max Lv	30fea4a705	Merge branch 'master' of github.com:shadowsocks/shadowsocks-android	2016-09-04 10:19:15 +08:00
Max Lv	6df227d231	Update kcptun	2016-08-28 18:11:29 +08:00