add apple silicon support

cloverzrg · Jan 20, 2022 · 9e83854 · 9e83854
1 parent 53abda7
commit 9e83854
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 65 deletions.
diff --git a/Podfile b/Podfile
@@ -12,8 +12,8 @@ target 'ShadowsocksX-NG' do
   pod 'MASShortcut', '~> 2'
 
   # https://github.com/ReactiveX/RxSwift/blob/master/Documentation/GettingStarted.md
-  pod 'RxSwift',    '~> 6.2.0'
-  pod 'RxCocoa',    '~> 6.2.0'
+  pod 'RxSwift',    '~> 6.5.0'
+  pod 'RxCocoa',    '~> 6.5.0'
 
   target 'ShadowsocksX-NGTests' do
     inherit! :search_paths

diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Pods/Target Support Files/RxCocoa/RxCocoa-Info.plist b/Pods/Target Support Files/RxCocoa/RxCocoa-Info.plist
diff --git a/Pods/Target Support Files/RxRelay/RxRelay-Info.plist b/Pods/Target Support Files/RxRelay/RxRelay-Info.plist
diff --git a/Pods/Target Support Files/RxSwift/RxSwift-Info.plist b/Pods/Target Support Files/RxSwift/RxSwift-Info.plist
diff --git a/ShadowsocksX-NG.xcodeproj/project.pbxproj b/ShadowsocksX-NG.xcodeproj/project.pbxproj
@@ -1062,7 +1062,8 @@
 					"$(PROJECT_DIR)/ShadowsocksX-NG/simple-obfs",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 1.9.4;
+				MARKETING_VERSION = 1.9.5;
+				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NG";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1097,7 +1098,8 @@
 					"$(PROJECT_DIR)/ShadowsocksX-NG/simple-obfs",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 1.9.4;
+				MARKETING_VERSION = 1.9.5;
+				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NG";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";