diff --git a/ShadowsocksX-NG/Info.plist b/ShadowsocksX-NG/Info.plist index d68bdf5..fe71f4b 100644 --- a/ShadowsocksX-NG/Info.plist +++ b/ShadowsocksX-NG/Info.plist @@ -48,7 +48,7 @@ CFBundleVersion - 1 + 3 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/ShadowsocksX-NG/LaunchAgentUtils.swift b/ShadowsocksX-NG/LaunchAgentUtils.swift index 356df7b..c4a1395 100644 --- a/ShadowsocksX-NG/LaunchAgentUtils.swift +++ b/ShadowsocksX-NG/LaunchAgentUtils.swift @@ -8,7 +8,7 @@ import Foundation -let SS_LOCAL_VERSION = "2.5.4" +let SS_LOCAL_VERSION = "2.5.6.static" let PRIVOXY_VERSION = "3.0.26.static" let APP_SUPPORT_DIR = "/Library/Application Support/ShadowsocksX-NG/" let LAUNCH_AGENT_DIR = "/Library/LaunchAgents/" @@ -320,3 +320,5 @@ func SyncPrivoxy() { } } } + +// MARK: dependency diff --git a/ShadowsocksX-NG/NetWorkMonitor.swift b/ShadowsocksX-NG/NetWorkMonitor.swift index e2c113d..79c7a9f 100755 --- a/ShadowsocksX-NG/NetWorkMonitor.swift +++ b/ShadowsocksX-NG/NetWorkMonitor.swift @@ -32,7 +32,7 @@ open class NetWorkMonitor: NSObject { alertView.messageText = "网速显示不支持 macOS 10.12 Sierra!" alertView.informativeText = "因为 macOS 10.12 Sierra ABI 不稳定,因此暂时移除网速功能" alertView.addButton(withTitle: "取消网速显示") - DispatchQueue.main.sync(execute: { Void in + _ = DispatchQueue.main.sync(execute: { Void in alertView.runModal() }) stop() diff --git a/ShadowsocksX-NG/install_ss_local.sh b/ShadowsocksX-NG/install_ss_local.sh index 912230d..4c34d02 100755 --- a/ShadowsocksX-NG/install_ss_local.sh +++ b/ShadowsocksX-NG/install_ss_local.sh @@ -8,7 +8,7 @@ cd `dirname "${BASH_SOURCE[0]}"` -ssLocalVersion=2.5.4 +ssLocalVersion=2.5.6.static mkdir -p "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-$ssLocalVersion" cp -f ss-local "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-$ssLocalVersion/" rm -f "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local" diff --git a/ShadowsocksX-NG/ss-local b/ShadowsocksX-NG/ss-local index 111fa5c..6045c71 100755 Binary files a/ShadowsocksX-NG/ss-local and b/ShadowsocksX-NG/ss-local differ