Skip to content

Commit 46e3cd8

Browse files
committed
添加从粘贴板导入ssr链接
大量的代码改动是因为 swift 自动从3到4的转换
1 parent 0236405 commit 46e3cd8

14 files changed

+360
-137
lines changed

Pods/Pods.xcodeproj/project.pbxproj

Lines changed: 17 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ShadowsocksX-NG.xcodeproj/project.pbxproj

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@
248248
BD2EDEB581B59F4898133A58 /* Pods-proxy_conf_helper.debug.xcconfig */,
249249
483228B0E4F999EC8C56A355 /* Pods-proxy_conf_helper.release.xcconfig */,
250250
);
251-
name = Pods;
252251
path = Pods;
253252
sourceTree = "<group>";
254253
};
@@ -472,12 +471,12 @@
472471
9B0BFFE41D0460A70040E62B = {
473472
CreatedOnToolsVersion = 7.3.1;
474473
DevelopmentTeam = HJZS8T264C;
475-
LastSwiftMigration = 0800;
474+
LastSwiftMigration = 1010;
476475
ProvisioningStyle = Automatic;
477476
};
478477
9B0BFFF31D0460A70040E62B = {
479478
CreatedOnToolsVersion = 7.3.1;
480-
LastSwiftMigration = 0800;
479+
LastSwiftMigration = 1010;
481480
TestTargetID = 9B0BFFE41D0460A70040E62B;
482481
};
483482
9B3FFF431D09CD3B0019A709 = {
@@ -930,7 +929,8 @@
930929
PRODUCT_NAME = "$(TARGET_NAME)";
931930
SWIFT_OBJC_BRIDGING_HEADER = "ShadowsocksX-NG/ShadowsocksX-NG-Bridging-Header.h";
932931
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
933-
SWIFT_VERSION = 3.0;
932+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
933+
SWIFT_VERSION = 4.2;
934934
};
935935
name = Debug;
936936
};
@@ -960,7 +960,8 @@
960960
PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NG";
961961
PRODUCT_NAME = "$(TARGET_NAME)";
962962
SWIFT_OBJC_BRIDGING_HEADER = "ShadowsocksX-NG/ShadowsocksX-NG-Bridging-Header.h";
963-
SWIFT_VERSION = 3.0;
963+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
964+
SWIFT_VERSION = 4.2;
964965
};
965966
name = Release;
966967
};
@@ -974,7 +975,8 @@
974975
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
975976
PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NGTests";
976977
PRODUCT_NAME = "$(TARGET_NAME)";
977-
SWIFT_VERSION = 3.0;
978+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
979+
SWIFT_VERSION = 4.2;
978980
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ShadowsocksX-NG.app/Contents/MacOS/ShadowsocksX-NG";
979981
};
980982
name = Debug;
@@ -989,7 +991,8 @@
989991
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
990992
PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NGTests";
991993
PRODUCT_NAME = "$(TARGET_NAME)";
992-
SWIFT_VERSION = 3.0;
994+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
995+
SWIFT_VERSION = 4.2;
993996
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ShadowsocksX-NG.app/Contents/MacOS/ShadowsocksX-NG";
994997
};
995998
name = Release;

0 commit comments

Comments
 (0)