diff --git a/Podfile b/Podfile index a4a0c03..8361bb0 100644 --- a/Podfile +++ b/Podfile @@ -19,3 +19,11 @@ end target 'proxy_conf_helper' do pod 'BRLOptionParser', '~> 0.3.1' end + +post_install do |installer| + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings['SWIFT_VERSION'] = '2.3' + end + end +end diff --git a/ShadowsocksX-NG/LaunchAgentUtils.swift b/ShadowsocksX-NG/LaunchAgentUtils.swift index c9d61f1..9f7a7b3 100644 --- a/ShadowsocksX-NG/LaunchAgentUtils.swift +++ b/ShadowsocksX-NG/LaunchAgentUtils.swift @@ -8,7 +8,7 @@ import Foundation -let SS_LOCAL_VERSION = "2.4.8" +let SS_LOCAL_VERSION = "2.4.9" let APP_SUPPORT_DIR = "/Library/Application Support/ShadowsocksX-NG/" let LAUNCH_AGENT_DIR = "/Library/LaunchAgents/" let LAUNCH_AGENT_CONF_NAME = "com.qiuyuzhou.shadowsocksX-NG.local.plist" diff --git a/ShadowsocksX-NG/NetWorkMonitor.swift b/ShadowsocksX-NG/NetWorkMonitor.swift index 29b8590..f8888fe 100755 --- a/ShadowsocksX-NG/NetWorkMonitor.swift +++ b/ShadowsocksX-NG/NetWorkMonitor.swift @@ -32,7 +32,9 @@ public class NetWorkMonitor: NSObject { alertView.messageText = "网速显示不支持 macOS 10.12 Sierra!" alertView.informativeText = "因为 macOS 10.12 Sierra ABI 不稳定,因此暂时移除网速功能" alertView.addButtonWithTitle("取消网速显示") - alertView.runModal() + dispatch_sync(dispatch_get_main_queue(), { Void in + alertView.runModal() + }) stop() // NSRunLoop.currentRunLoop().run() // CFRunLoopRun() diff --git a/ShadowsocksX-NG/PreferencesWindowController.swift b/ShadowsocksX-NG/PreferencesWindowController.swift index 99cf659..12739fa 100644 --- a/ShadowsocksX-NG/PreferencesWindowController.swift +++ b/ShadowsocksX-NG/PreferencesWindowController.swift @@ -75,6 +75,7 @@ class PreferencesWindowController: NSWindowController "verify_sha1", "auth_sha1", "auth_sha1_v2", + "auth_sha1_v4", ]) ObfsTextField.addItemsWithObjectValues([ "palin", diff --git a/ShadowsocksX-NG/install_ss_local.sh b/ShadowsocksX-NG/install_ss_local.sh index 41d78f9..7d8affa 100755 --- a/ShadowsocksX-NG/install_ss_local.sh +++ b/ShadowsocksX-NG/install_ss_local.sh @@ -8,11 +8,12 @@ cd `dirname "${BASH_SOURCE[0]}"` -mkdir -p "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-2.4.8" -cp -f ss-local "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-2.4.8/" +ssLocalVersion=2.4.9 +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" -ln -s "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-2.4.8/ss-local" "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local" +ln -s "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-$ssLocalVersion/ss-local" "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local" cp -f libcrypto.1.0.0.dylib "$HOME/Library/Application Support/ShadowsocksX-NG/" -echo done \ No newline at end of file +echo done diff --git a/ShadowsocksX-NG/ss-local b/ShadowsocksX-NG/ss-local index 2d2aea4..1e5d4c2 100755 Binary files a/ShadowsocksX-NG/ss-local and b/ShadowsocksX-NG/ss-local differ