From 18f6c4ad80e449b4c72d3b9b43f910e7a37a231e Mon Sep 17 00:00:00 2001 From: Qiu Yuzhou Date: Thu, 24 Jun 2021 01:16:32 +0800 Subject: [PATCH] make project built by latest xcode --- .../LaunchHelper.xcodeproj/project.pbxproj | 15 +- Pods/Pods.xcodeproj/project.pbxproj | 28 +- ShadowsocksX-NG.xcodeproj/project.pbxproj | 299 +++++++++--------- ShadowsocksX-NG/PACUtils.swift | 30 +- ShadowsocksX-NG/ServerProfile.swift | 2 +- ShadowsocksX-NG/Utils.m | 2 +- ShadowsocksX-NGTests/Info.plist | 6 +- .../ShadowsocksX_NGTests.swift | 25 +- 8 files changed, 198 insertions(+), 209 deletions(-) diff --git a/LaunchHelper/LaunchHelper.xcodeproj/project.pbxproj b/LaunchHelper/LaunchHelper.xcodeproj/project.pbxproj index 868f153d..ae54e336 100644 --- a/LaunchHelper/LaunchHelper.xcodeproj/project.pbxproj +++ b/LaunchHelper/LaunchHelper.xcodeproj/project.pbxproj @@ -102,7 +102,8 @@ TargetAttributes = { 9B9F138C1E8A282C00DE4794 = { CreatedOnToolsVersion = 8.2.1; - ProvisioningStyle = Manual; + DevelopmentTeam = RJX3H8KBAF; + ProvisioningStyle = Automatic; }; }; }; @@ -272,10 +273,10 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "-"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = RJX3H8KBAF; INFOPLIST_FILE = LaunchHelper/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; @@ -290,10 +291,10 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "-"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = RJX3H8KBAF; INFOPLIST_FILE = LaunchHelper/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 52c4264e..f4979091 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -2700,7 +2700,7 @@ INFOPLIST_FILE = "Target Support Files/RxSwift/RxSwift-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.12; MODULEMAP_FILE = "Target Support Files/RxSwift/RxSwift.modulemap"; PRODUCT_MODULE_NAME = RxSwift; PRODUCT_NAME = RxSwift; @@ -2730,7 +2730,7 @@ INFOPLIST_FILE = "Target Support Files/GCDWebServer/GCDWebServer-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.12; MODULEMAP_FILE = "Target Support Files/GCDWebServer/GCDWebServer.modulemap"; PRODUCT_MODULE_NAME = GCDWebServer; PRODUCT_NAME = GCDWebServer; @@ -2760,7 +2760,7 @@ INFOPLIST_FILE = "Target Support Files/RxCocoa/RxCocoa-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.12; MODULEMAP_FILE = "Target Support Files/RxCocoa/RxCocoa.modulemap"; PRODUCT_MODULE_NAME = RxCocoa; PRODUCT_NAME = RxCocoa; @@ -2790,7 +2790,7 @@ INFOPLIST_FILE = "Target Support Files/RxCocoa/RxCocoa-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.12; MODULEMAP_FILE = "Target Support Files/RxCocoa/RxCocoa.modulemap"; PRODUCT_MODULE_NAME = RxCocoa; PRODUCT_NAME = RxCocoa; @@ -2845,7 +2845,7 @@ IBSC_MODULE = MASShortcut; INFOPLIST_FILE = "Target Support Files/MASShortcut/ResourceBundle-MASShortcut-MASShortcut-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_NAME = MASShortcut; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -2862,7 +2862,7 @@ "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; EXECUTABLE_PREFIX = lib; GCC_PREFIX_HEADER = "Target Support Files/BRLOptionParser/BRLOptionParser-prefix.pch"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.12; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; @@ -2958,7 +2958,7 @@ INFOPLIST_FILE = "Target Support Files/GCDWebServer/GCDWebServer-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.12; MODULEMAP_FILE = "Target Support Files/GCDWebServer/GCDWebServer.modulemap"; PRODUCT_MODULE_NAME = GCDWebServer; PRODUCT_NAME = GCDWebServer; @@ -3052,7 +3052,7 @@ INFOPLIST_FILE = "Target Support Files/RxRelay/RxRelay-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.12; MODULEMAP_FILE = "Target Support Files/RxRelay/RxRelay.modulemap"; PRODUCT_MODULE_NAME = RxRelay; PRODUCT_NAME = RxRelay; @@ -3140,7 +3140,7 @@ IBSC_MODULE = MASShortcut; INFOPLIST_FILE = "Target Support Files/MASShortcut/ResourceBundle-MASShortcut-MASShortcut-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_NAME = MASShortcut; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -3157,7 +3157,7 @@ "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; EXECUTABLE_PREFIX = lib; GCC_PREFIX_HEADER = "Target Support Files/BRLOptionParser/BRLOptionParser-prefix.pch"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.12; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; @@ -3188,7 +3188,7 @@ INFOPLIST_FILE = "Target Support Files/MASShortcut/MASShortcut-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.12; MODULEMAP_FILE = "Target Support Files/MASShortcut/MASShortcut.modulemap"; PRODUCT_MODULE_NAME = MASShortcut; PRODUCT_NAME = MASShortcut; @@ -3311,7 +3311,7 @@ INFOPLIST_FILE = "Target Support Files/MASShortcut/MASShortcut-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.12; MODULEMAP_FILE = "Target Support Files/MASShortcut/MASShortcut.modulemap"; PRODUCT_MODULE_NAME = MASShortcut; PRODUCT_NAME = MASShortcut; @@ -3341,7 +3341,7 @@ INFOPLIST_FILE = "Target Support Files/RxRelay/RxRelay-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.12; MODULEMAP_FILE = "Target Support Files/RxRelay/RxRelay.modulemap"; PRODUCT_MODULE_NAME = RxRelay; PRODUCT_NAME = RxRelay; @@ -3371,7 +3371,7 @@ INFOPLIST_FILE = "Target Support Files/RxSwift/RxSwift-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.12; MODULEMAP_FILE = "Target Support Files/RxSwift/RxSwift.modulemap"; PRODUCT_MODULE_NAME = RxSwift; PRODUCT_NAME = RxSwift; diff --git a/ShadowsocksX-NG.xcodeproj/project.pbxproj b/ShadowsocksX-NG.xcodeproj/project.pbxproj index 32c6bc2b..68a3760c 100644 --- a/ShadowsocksX-NG.xcodeproj/project.pbxproj +++ b/ShadowsocksX-NG.xcodeproj/project.pbxproj @@ -9,12 +9,10 @@ /* Begin PBXBuildFile section */ 1C82DBA81FA96C7500B32551 /* obfs-local in Resources */ = {isa = PBXBuildFile; fileRef = 1C82DBA51FA96C7400B32551 /* obfs-local */; }; 1C82DBAA1FA96FB600B32551 /* install_simple_obfs.sh in Resources */ = {isa = PBXBuildFile; fileRef = 1C82DBA91FA96F0300B32551 /* install_simple_obfs.sh */; }; - 258E511BA910B0521B24DAB8 /* Pods_ShadowsocksX_NG.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 283ED1A8E9B711AC65670031 /* Pods_ShadowsocksX_NG.framework */; }; 9B07EFA71D048BBB0052D9DF /* ss-local in Resources */ = {isa = PBXBuildFile; fileRef = 9B07EFA61D048BBB0052D9DF /* ss-local */; }; 9B0BFFE91D0460A70040E62B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B0BFFE81D0460A70040E62B /* AppDelegate.swift */; }; 9B0BFFEB1D0460A70040E62B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9B0BFFEA1D0460A70040E62B /* Assets.xcassets */; }; 9B0BFFEE1D0460A70040E62B /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9B0BFFEC1D0460A70040E62B /* MainMenu.xib */; }; - 9B0BFFF91D0460A70040E62B /* ShadowsocksX_NGTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B0BFFF81D0460A70040E62B /* ShadowsocksX_NGTests.swift */; }; 9B20804A2326AC460075386C /* kcptun.sh in Resources */ = {isa = PBXBuildFile; fileRef = 9B2080482326AC460075386C /* kcptun.sh */; }; 9B20804B2326AC460075386C /* client in Resources */ = {isa = PBXBuildFile; fileRef = 9B2080492326AC460075386C /* client */; }; 9B2491B41D0ACC3A003BBECC /* PreferencesWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9B2491B61D0ACC3A003BBECC /* PreferencesWindowController.xib */; }; @@ -40,6 +38,8 @@ 9B5831FF1E741969009D5B7D /* PreferencesWinController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B5831FD1E741969009D5B7D /* PreferencesWinController.swift */; }; 9B5AA0AC209C43C200E8B659 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 9B5AA0AB209C43C200E8B659 /* Credits.rtf */; }; 9B5D132A2154A62600F99F03 /* install_kcptun.sh in Resources */ = {isa = PBXBuildFile; fileRef = 9B5D13272154A50700F99F03 /* install_kcptun.sh */; }; + 9B5DD7B02683A354005EFEF7 /* ShadowsocksX_NGTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B5DD7AF2683A354005EFEF7 /* ShadowsocksX_NGTests.swift */; }; + 9B5DD7B82683A369005EFEF7 /* ServerProfileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B5DD7B72683A369005EFEF7 /* ServerProfileTests.swift */; }; 9B6BF9541E27B2570061B9A7 /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B6BF9531E27B2570061B9A7 /* ServiceManagement.framework */; }; 9B7297E7214D69C300FD24AA /* libmbedcrypto.2.12.0.dylib in Resources */ = {isa = PBXBuildFile; fileRef = 9B7297E5214D68F800FD24AA /* libmbedcrypto.2.12.0.dylib */; }; 9B7297EA214D7C6B00FD24AA /* ShareServerProfilesWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B7297E8214D7C6B00FD24AA /* ShareServerProfilesWindowController.swift */; }; @@ -93,19 +93,10 @@ C6D429991DA76FBC002A5711 /* privoxy.template.config in Resources */ = {isa = PBXBuildFile; fileRef = C6D429981DA76FBC002A5711 /* privoxy.template.config */; }; C8E42A6C1D4F270A0074C7EA /* UserRulesController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E42A6A1D4F270A0074C7EA /* UserRulesController.swift */; }; C8E42A6E1D4F2CAF0074C7EA /* UserRulesController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C8E42A701D4F2CAF0074C7EA /* UserRulesController.xib */; }; - D8E3630B1E2072980027449B /* ServerProfileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8E3630A1E2072980027449B /* ServerProfileTests.swift */; }; - E0E57CCA7EB34B90F9D340F2 /* Pods_ShadowsocksX_NGTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 388120F062D7EB7DD0D8DDCA /* Pods_ShadowsocksX_NGTests.framework */; }; F0809FF1595BE2966343D3C7 /* libPods-proxy_conf_helper.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E7783AEDB4A3BDDC9FF16AC /* libPods-proxy_conf_helper.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 9B0BFFF51D0460A70040E62B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9B0BFFDD1D0460A70040E62B /* Project object */; - proxyType = 1; - remoteGlobalIDString = 9B0BFFE41D0460A70040E62B; - remoteInfo = "ShadowsocksX-NG"; - }; 9B3FFF521D09E2B30019A709 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 9B0BFFDD1D0460A70040E62B /* Project object */; @@ -113,6 +104,13 @@ remoteGlobalIDString = 9B3FFF431D09CD3B0019A709; remoteInfo = proxy_conf_helper; }; + 9B5DD7B22683A354005EFEF7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 9B0BFFDD1D0460A70040E62B /* Project object */; + proxyType = 1; + remoteGlobalIDString = 9B0BFFE41D0460A70040E62B; + remoteInfo = "ShadowsocksX-NG"; + }; 9B9F13A51E8A282D00DE4794 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 9B9F13A11E8A282C00DE4794 /* LaunchHelper.xcodeproj */; @@ -162,9 +160,6 @@ 9B0BFFEA1D0460A70040E62B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 9B0BFFED1D0460A70040E62B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; 9B0BFFEF1D0460A70040E62B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9B0BFFF41D0460A70040E62B /* ShadowsocksX-NGTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ShadowsocksX-NGTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 9B0BFFF81D0460A70040E62B /* ShadowsocksX_NGTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShadowsocksX_NGTests.swift; sourceTree = ""; }; - 9B0BFFFA1D0460A70040E62B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9B172A601D0ADA5B00B87B9A /* genstrings.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = genstrings.py; sourceTree = ""; }; 9B172A6B1D0ADDDD00B87B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = ""; }; 9B172A6D1D0ADDE800B87B9A /* zh-Hans */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = ""; }; @@ -204,6 +199,10 @@ 9B5AA0A2209C103900E8B659 /* libcares.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libcares.2.dylib; sourceTree = ""; }; 9B5AA0AB209C43C200E8B659 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = ""; }; 9B5D13272154A50700F99F03 /* install_kcptun.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = install_kcptun.sh; sourceTree = ""; }; + 9B5DD7AD2683A354005EFEF7 /* ShadowsocksX-NGTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ShadowsocksX-NGTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 9B5DD7AF2683A354005EFEF7 /* ShadowsocksX_NGTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShadowsocksX_NGTests.swift; sourceTree = ""; }; + 9B5DD7B12683A354005EFEF7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 9B5DD7B72683A369005EFEF7 /* ServerProfileTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServerProfileTests.swift; sourceTree = ""; }; 9B6BF9531E27B2570061B9A7 /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/Frameworks/ServiceManagement.framework; sourceTree = SDKROOT; }; 9B7297E5214D68F800FD24AA /* libmbedcrypto.2.12.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libmbedcrypto.2.12.0.dylib; sourceTree = ""; }; 9B7297E8214D7C6B00FD24AA /* ShareServerProfilesWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareServerProfilesWindowController.swift; sourceTree = ""; }; @@ -263,7 +262,6 @@ C8E42A6A1D4F270A0074C7EA /* UserRulesController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserRulesController.swift; sourceTree = ""; }; C8E42A6F1D4F2CAF0074C7EA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UserRulesController.xib; sourceTree = ""; }; C8E42A721D4F2CB10074C7EA /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/UserRulesController.strings"; sourceTree = ""; }; - D8E3630A1E2072980027449B /* ServerProfileTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServerProfileTests.swift; sourceTree = ""; }; E9E9FB3855DA55D0710EE7BD /* Pods-ShadowsocksX-NG.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShadowsocksX-NG.release.xcconfig"; path = "Pods/Target Support Files/Pods-ShadowsocksX-NG/Pods-ShadowsocksX-NG.release.xcconfig"; sourceTree = ""; }; FE3237E9FB24D9B924A0E630 /* Pods-ShadowsocksX-NG.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShadowsocksX-NG.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ShadowsocksX-NG/Pods-ShadowsocksX-NG.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -275,15 +273,6 @@ files = ( 9B6BF9541E27B2570061B9A7 /* ServiceManagement.framework in Frameworks */, 9B3FFF3E1D08D9910019A709 /* SystemConfiguration.framework in Frameworks */, - 258E511BA910B0521B24DAB8 /* Pods_ShadowsocksX_NG.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 9B0BFFF11D0460A70040E62B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - E0E57CCA7EB34B90F9D340F2 /* Pods_ShadowsocksX_NGTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -295,6 +284,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 9B5DD7AA2683A354005EFEF7 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -349,8 +345,8 @@ 9B172A601D0ADA5B00B87B9A /* genstrings.py */, 9B9F13A11E8A282C00DE4794 /* LaunchHelper.xcodeproj */, 9B0BFFE71D0460A70040E62B /* ShadowsocksX-NG */, - 9B0BFFF71D0460A70040E62B /* ShadowsocksX-NGTests */, 9B3FFF451D09CD3B0019A709 /* proxy_conf_helper */, + 9B5DD7AE2683A354005EFEF7 /* ShadowsocksX-NGTests */, 9B0BFFE61D0460A70040E62B /* Products */, 33F4F299F89330966F4526E4 /* Pods */, D3CE66CC039F651F28057DDB /* Frameworks */, @@ -361,8 +357,8 @@ isa = PBXGroup; children = ( 9B0BFFE51D0460A70040E62B /* ShadowsocksX-NG.app */, - 9B0BFFF41D0460A70040E62B /* ShadowsocksX-NGTests.xctest */, 9B3FFF441D09CD3B0019A709 /* proxy_conf_helper */, + 9B5DD7AD2683A354005EFEF7 /* ShadowsocksX-NGTests.xctest */, ); name = Products; sourceTree = ""; @@ -402,16 +398,6 @@ path = "ShadowsocksX-NG"; sourceTree = ""; }; - 9B0BFFF71D0460A70040E62B /* ShadowsocksX-NGTests */ = { - isa = PBXGroup; - children = ( - D8E3630A1E2072980027449B /* ServerProfileTests.swift */, - 9B0BFFF81D0460A70040E62B /* ShadowsocksX_NGTests.swift */, - 9B0BFFFA1D0460A70040E62B /* Info.plist */, - ); - path = "ShadowsocksX-NGTests"; - sourceTree = ""; - }; 9B3FFF0B1D05D8B80019A709 /* UI */ = { isa = PBXGroup; children = ( @@ -482,6 +468,16 @@ path = kcptun; sourceTree = ""; }; + 9B5DD7AE2683A354005EFEF7 /* ShadowsocksX-NGTests */ = { + isa = PBXGroup; + children = ( + 9B5DD7B72683A369005EFEF7 /* ServerProfileTests.swift */, + 9B5DD7AF2683A354005EFEF7 /* ShadowsocksX_NGTests.swift */, + 9B5DD7B12683A354005EFEF7 /* Info.plist */, + ); + path = "ShadowsocksX-NGTests"; + sourceTree = ""; + }; 9B9F13A21E8A282C00DE4794 /* Products */ = { isa = PBXGroup; children = ( @@ -562,25 +558,6 @@ productReference = 9B0BFFE51D0460A70040E62B /* ShadowsocksX-NG.app */; productType = "com.apple.product-type.application"; }; - 9B0BFFF31D0460A70040E62B /* ShadowsocksX-NGTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 9B0B000B1D0460A70040E62B /* Build configuration list for PBXNativeTarget "ShadowsocksX-NGTests" */; - buildPhases = ( - 22E2FC257F00091B923B1A15 /* [CP] Check Pods Manifest.lock */, - 9B0BFFF01D0460A70040E62B /* Sources */, - 9B0BFFF11D0460A70040E62B /* Frameworks */, - 9B0BFFF21D0460A70040E62B /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 9B0BFFF61D0460A70040E62B /* PBXTargetDependency */, - ); - name = "ShadowsocksX-NGTests"; - productName = "ShadowsocksX-NGTests"; - productReference = 9B0BFFF41D0460A70040E62B /* ShadowsocksX-NGTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; 9B3FFF431D09CD3B0019A709 /* proxy_conf_helper */ = { isa = PBXNativeTarget; buildConfigurationList = 9B3FFF481D09CD3B0019A709 /* Build configuration list for PBXNativeTarget "proxy_conf_helper" */; @@ -599,29 +576,50 @@ productReference = 9B3FFF441D09CD3B0019A709 /* proxy_conf_helper */; productType = "com.apple.product-type.tool"; }; + 9B5DD7AC2683A354005EFEF7 /* ShadowsocksX-NGTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 9B5DD7B42683A354005EFEF7 /* Build configuration list for PBXNativeTarget "ShadowsocksX-NGTests" */; + buildPhases = ( + 9B5DD7A92683A354005EFEF7 /* Sources */, + 9B5DD7AA2683A354005EFEF7 /* Frameworks */, + 9B5DD7AB2683A354005EFEF7 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 9B5DD7B32683A354005EFEF7 /* PBXTargetDependency */, + ); + name = "ShadowsocksX-NGTests"; + productName = "ShadowsocksX-NGTests"; + productReference = 9B5DD7AD2683A354005EFEF7 /* ShadowsocksX-NGTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ 9B0BFFDD1D0460A70040E62B /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0730; + LastSwiftUpdateCheck = 1250; LastUpgradeCheck = 1250; ORGANIZATIONNAME = qiuyuzhou; TargetAttributes = { 9B0BFFE41D0460A70040E62B = { CreatedOnToolsVersion = 7.3.1; + DevelopmentTeam = RJX3H8KBAF; LastSwiftMigration = 0900; - ProvisioningStyle = Manual; - }; - 9B0BFFF31D0460A70040E62B = { - CreatedOnToolsVersion = 7.3.1; - LastSwiftMigration = 0900; - ProvisioningStyle = Manual; - TestTargetID = 9B0BFFE41D0460A70040E62B; + ProvisioningStyle = Automatic; }; 9B3FFF431D09CD3B0019A709 = { CreatedOnToolsVersion = 7.3.1; + DevelopmentTeam = RJX3H8KBAF; + ProvisioningStyle = Automatic; + }; + 9B5DD7AC2683A354005EFEF7 = { + CreatedOnToolsVersion = 12.5.1; + DevelopmentTeam = RJX3H8KBAF; + ProvisioningStyle = Automatic; + TestTargetID = 9B0BFFE41D0460A70040E62B; }; }; }; @@ -647,8 +645,8 @@ projectRoot = ""; targets = ( 9B0BFFE41D0460A70040E62B /* ShadowsocksX-NG */, - 9B0BFFF31D0460A70040E62B /* ShadowsocksX-NGTests */, 9B3FFF431D09CD3B0019A709 /* proxy_conf_helper */, + 9B5DD7AC2683A354005EFEF7 /* ShadowsocksX-NGTests */, ); }; /* End PBXProject section */ @@ -728,7 +726,7 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 9B0BFFF21D0460A70040E62B /* Resources */ = { + 9B5DD7AB2683A354005EFEF7 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -738,24 +736,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 22E2FC257F00091B923B1A15 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-ShadowsocksX-NGTests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; 3545247EFCD033C3FA63EA6C /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -853,15 +833,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 9B0BFFF01D0460A70040E62B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 9B0BFFF91D0460A70040E62B /* ShadowsocksX_NGTests.swift in Sources */, - D8E3630B1E2072980027449B /* ServerProfileTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 9B3FFF401D09CD3B0019A709 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -870,19 +841,28 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 9B5DD7A92683A354005EFEF7 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 9B5DD7B82683A369005EFEF7 /* ServerProfileTests.swift in Sources */, + 9B5DD7B02683A354005EFEF7 /* ShadowsocksX_NGTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 9B0BFFF61D0460A70040E62B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 9B0BFFE41D0460A70040E62B /* ShadowsocksX-NG */; - targetProxy = 9B0BFFF51D0460A70040E62B /* PBXContainerItemProxy */; - }; 9B3FFF531D09E2B30019A709 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 9B3FFF431D09CD3B0019A709 /* proxy_conf_helper */; targetProxy = 9B3FFF521D09E2B30019A709 /* PBXContainerItemProxy */; }; + 9B5DD7B32683A354005EFEF7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 9B0BFFE41D0460A70040E62B /* ShadowsocksX-NG */; + targetProxy = 9B5DD7B22683A354005EFEF7 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -1065,13 +1045,12 @@ isa = XCBuildConfiguration; baseConfigurationReference = FE3237E9FB24D9B924A0E630 /* Pods-ShadowsocksX-NG.debug.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "-"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = RJX3H8KBAF; HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/libcork/include/", @@ -1101,7 +1080,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = E9E9FB3855DA55D0710EE7BD /* Pods-ShadowsocksX-NG.release.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "-"; @@ -1132,53 +1110,15 @@ }; name = Release; }; - 9B0B000C1D0460A70040E62B /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 5B6203C1228FCD3D365814AC /* Pods-ShadowsocksX-NGTests.debug.xcconfig */; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Manual; - COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = "ShadowsocksX-NGTests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NGTests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_OBJC_BRIDGING_HEADER = "ShadowsocksX-NG/ShadowsocksX-NG-Bridging-Header.h"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ShadowsocksX-NG.app/Contents/MacOS/ShadowsocksX-NG"; - }; - name = Debug; - }; - 9B0B000D1D0460A70040E62B /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3AC7CD9886196A997D6FC78D /* Pods-ShadowsocksX-NGTests.release.xcconfig */; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Manual; - COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = "ShadowsocksX-NGTests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NGTests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_OBJC_BRIDGING_HEADER = "ShadowsocksX-NG/ShadowsocksX-NG-Bridging-Header.h"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ShadowsocksX-NG.app/Contents/MacOS/ShadowsocksX-NG"; - }; - name = Release; - }; 9B3FFF491D09CD3B0019A709 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = B4E6A97CA843F3943524B686 /* Pods-proxy_conf_helper.debug.xcconfig */; buildSettings = { - CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = RJX3H8KBAF; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; }; name = Debug; @@ -1193,6 +1133,59 @@ }; name = Release; }; + 9B5DD7B52683A354005EFEF7 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + BUNDLE_LOADER = "$(TEST_HOST)"; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = RJX3H8KBAF; + GCC_C_LANGUAGE_STANDARD = gnu11; + INFOPLIST_FILE = "ShadowsocksX-NGTests/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 11.3; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NGTests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ShadowsocksX-NG.app/Contents/MacOS/ShadowsocksX-NG"; + }; + name = Debug; + }; + 9B5DD7B62683A354005EFEF7 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + BUNDLE_LOADER = "$(TEST_HOST)"; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = RJX3H8KBAF; + GCC_C_LANGUAGE_STANDARD = gnu11; + INFOPLIST_FILE = "ShadowsocksX-NGTests/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 11.3; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NGTests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ShadowsocksX-NG.app/Contents/MacOS/ShadowsocksX-NG"; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -1205,15 +1198,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 9B0B000B1D0460A70040E62B /* Build configuration list for PBXNativeTarget "ShadowsocksX-NGTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 9B0B000C1D0460A70040E62B /* Debug */, - 9B0B000D1D0460A70040E62B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 9B0BFFE01D0460A70040E62B /* Build configuration list for PBXProject "ShadowsocksX-NG" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -1232,6 +1216,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 9B5DD7B42683A354005EFEF7 /* Build configuration list for PBXNativeTarget "ShadowsocksX-NGTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 9B5DD7B52683A354005EFEF7 /* Debug */, + 9B5DD7B62683A354005EFEF7 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = 9B0BFFDD1D0460A70040E62B /* Project object */; diff --git a/ShadowsocksX-NG/PACUtils.swift b/ShadowsocksX-NG/PACUtils.swift index a1ce844a..24039751 100644 --- a/ShadowsocksX-NG/PACUtils.swift +++ b/ShadowsocksX-NG/PACUtils.swift @@ -170,25 +170,25 @@ func UpdatePACFromGFWList() { } let url = UserDefaults.standard.string(forKey: "GFWListURL") - Alamofire.request(url!) + AF.request(url!) + .validate() .responseString { response in - if response.result.isSuccess { - if let v = response.result.value { - do { - try v.write(toFile: GFWListFilePath, atomically: true, encoding: String.Encoding.utf8) - if GeneratePACFile() { - // Popup a user notification - let notification = NSUserNotification() - notification.title = "PAC has been updated by latest GFW List.".localized - NSUserNotificationCenter.default - .deliver(notification) - } - } catch { - + switch response.result { + case .success(let v): + do { + try v.write(toFile: GFWListFilePath, atomically: true, encoding: String.Encoding.utf8) + if GeneratePACFile() { + // Popup a user notification + let notification = NSUserNotification() + notification.title = "PAC has been updated by latest GFW List.".localized + NSUserNotificationCenter.default + .deliver(notification) } + } catch { + } - } else { + case .failure: // Popup a user notification let notification = NSUserNotification() notification.title = "Failed to download latest GFW List.".localized diff --git a/ShadowsocksX-NG/ServerProfile.swift b/ShadowsocksX-NG/ServerProfile.swift index 62a0870c..0f7696e6 100644 --- a/ShadowsocksX-NG/ServerProfile.swift +++ b/ShadowsocksX-NG/ServerProfile.swift @@ -94,7 +94,7 @@ class ServerProfile: NSObject, NSCopying { guard let decodedUrl = _decodedUrl else { return nil } - guard var parsedUrl = URLComponents(string: decodedUrl) else { + guard let parsedUrl = URLComponents(string: decodedUrl) else { return nil } guard let host = parsedUrl.host, let port = parsedUrl.port, diff --git a/ShadowsocksX-NG/Utils.m b/ShadowsocksX-NG/Utils.m index c5a62928..20f0fb76 100644 --- a/ShadowsocksX-NG/Utils.m +++ b/ShadowsocksX-NG/Utils.m @@ -10,7 +10,7 @@ #import #import -void ScanQRCodeOnScreen() { +void ScanQRCodeOnScreen(void) { /* displays[] Quartz display ID's */ CGDirectDisplayID *displays = nil; diff --git a/ShadowsocksX-NGTests/Info.plist b/ShadowsocksX-NGTests/Info.plist index ba72822e..64d65ca4 100644 --- a/ShadowsocksX-NGTests/Info.plist +++ b/ShadowsocksX-NGTests/Info.plist @@ -3,7 +3,7 @@ CFBundleDevelopmentRegion - en + $(DEVELOPMENT_LANGUAGE) CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -13,11 +13,9 @@ CFBundleName $(PRODUCT_NAME) CFBundlePackageType - BNDL + $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString 1.0 - CFBundleSignature - ???? CFBundleVersion 1 diff --git a/ShadowsocksX-NGTests/ShadowsocksX_NGTests.swift b/ShadowsocksX-NGTests/ShadowsocksX_NGTests.swift index 58c8fa6c..fbd393fe 100644 --- a/ShadowsocksX-NGTests/ShadowsocksX_NGTests.swift +++ b/ShadowsocksX-NGTests/ShadowsocksX_NGTests.swift @@ -2,33 +2,30 @@ // ShadowsocksX_NGTests.swift // ShadowsocksX-NGTests // -// Created by 邱宇舟 on 16/6/5. -// Copyright © 2016年 qiuyuzhou. All rights reserved. +// Created by 邱宇舟 on 2021/6/24. +// Copyright © 2021 qiuyuzhou. All rights reserved. // import XCTest -@testable import ShadowsocksX_NG class ShadowsocksX_NGTests: XCTestCase { - - override func setUp() { - super.setUp() + + override func setUpWithError() throws { // Put setup code here. This method is called before the invocation of each test method in the class. } - - override func tearDown() { + + override func tearDownWithError() throws { // Put teardown code here. This method is called after the invocation of each test method in the class. - super.tearDown() } - - func testExample() { + + func testExample() throws { // This is an example of a functional test case. // Use XCTAssert and related functions to verify your tests produce the correct results. } - - func testPerformanceExample() { + + func testPerformanceExample() throws { // This is an example of a performance test case. - self.measure { + measure { // Put the code you want to measure the time of here. } }