From 65ddd6f5d8c8e268159c174e72f84ff424ab54f7 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Wed, 14 Sep 2016 14:57:02 +0800 Subject: [PATCH] Bump version --- build.sbt | 4 ++-- src/main/AndroidManifest.xml | 4 ++-- src/main/jni/shadowsocks-libev | 2 +- .../scala/com/github/shadowsocks/ShadowsocksSettings.scala | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 460fe606..9232e1ff 100644 --- a/build.sbt +++ b/build.sbt @@ -31,8 +31,8 @@ resolvers += Resolver.jcenterRepo useSupportVectors libraryDependencies ++= Seq( - "com.android.support" % "design" % "24.2.0", - "com.android.support" % "gridlayout-v7" % "24.2.0", + "com.android.support" % "design" % "24.2.1", + "com.android.support" % "gridlayout-v7" % "24.2.1", "com.github.clans" % "fab" % "1.6.4", "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01", "com.github.kevinsawicki" % "http-request" % "6.0", diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 01a368b3..99242518 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionCode="156" + android:versionName="3.1.4"> diff --git a/src/main/jni/shadowsocks-libev b/src/main/jni/shadowsocks-libev index 6e48d25e..f7f90b1e 160000 --- a/src/main/jni/shadowsocks-libev +++ b/src/main/jni/shadowsocks-libev @@ -1 +1 @@ -Subproject commit 6e48d25eab5f6db3a4cce303fed703bf01f448e9 +Subproject commit f7f90b1eb2ab184c5e8dc4c15bc1eeffb54ad35c diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala index 281d9802..394d5a3f 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala @@ -207,7 +207,7 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan } def refreshProfile() { - val profile = app.currentProfile match { + profile = app.currentProfile match { case Some(profile) => profile case None => { app.profileManager.getFirstProfile match {