Daniel Zlotin преди 8 години
родител
ревизия
770b5de27c

+ 9
- 1
ios/ReactNativeNavigation.xcodeproj/project.pbxproj Целия файл

@@ -146,7 +146,7 @@
146 146
 		D8AFADB51BEE6F3F00A4592D /* Project object */ = {
147 147
 			isa = PBXProject;
148 148
 			attributes = {
149
-				LastUpgradeCheck = 0710;
149
+				LastUpgradeCheck = 0820;
150 150
 				ORGANIZATIONNAME = Wix;
151 151
 				TargetAttributes = {
152 152
 					D8AFADBC1BEE6F3F00A4592D = {
@@ -201,8 +201,10 @@
201 201
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
202 202
 				CLANG_WARN_EMPTY_BODY = YES;
203 203
 				CLANG_WARN_ENUM_CONVERSION = YES;
204
+				CLANG_WARN_INFINITE_RECURSION = YES;
204 205
 				CLANG_WARN_INT_CONVERSION = YES;
205 206
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
207
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
206 208
 				CLANG_WARN_UNREACHABLE_CODE = YES;
207 209
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
208 210
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -263,8 +265,10 @@
263 265
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
264 266
 				CLANG_WARN_EMPTY_BODY = YES;
265 267
 				CLANG_WARN_ENUM_CONVERSION = YES;
268
+				CLANG_WARN_INFINITE_RECURSION = YES;
266 269
 				CLANG_WARN_INT_CONVERSION = YES;
267 270
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
271
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
268 272
 				CLANG_WARN_UNREACHABLE_CODE = YES;
269 273
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
270 274
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -319,8 +323,10 @@
319 323
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
320 324
 				CLANG_WARN_EMPTY_BODY = YES;
321 325
 				CLANG_WARN_ENUM_CONVERSION = YES;
326
+				CLANG_WARN_INFINITE_RECURSION = YES;
322 327
 				CLANG_WARN_INT_CONVERSION = YES;
323 328
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
329
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
324 330
 				CLANG_WARN_UNREACHABLE_CODE = YES;
325 331
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
326 332
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -366,8 +372,10 @@
366 372
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
367 373
 				CLANG_WARN_EMPTY_BODY = YES;
368 374
 				CLANG_WARN_ENUM_CONVERSION = YES;
375
+				CLANG_WARN_INFINITE_RECURSION = YES;
369 376
 				CLANG_WARN_INT_CONVERSION = YES;
370 377
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
378
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
371 379
 				CLANG_WARN_UNREACHABLE_CODE = YES;
372 380
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
373 381
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";

+ 1
- 1
ios/ReactNativeNavigation.xcodeproj/xcshareddata/xcschemes/ReactNativeNavigation.xcscheme Целия файл

@@ -1,6 +1,6 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <Scheme
3
-   LastUpgradeVersion = "0710"
3
+   LastUpgradeVersion = "0820"
4 4
    version = "1.3">
5 5
    <BuildAction
6 6
       parallelizeBuildables = "YES"

+ 32
- 17
playground/ios/playground.xcodeproj/project.pbxproj Целия файл

@@ -23,6 +23,7 @@
23 23
 		146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
24 24
 		2647D65F1DB175C200B23722 /* libReactNativeNavigation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
25 25
 		7B9B39861DEB4091004A6281 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B9B39631DEB4076004A6281 /* libRCTAnimation.a */; };
26
+		7BD721FF1E2E421E00724059 /* libReactNativeNavigation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
26 27
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
27 28
 /* End PBXBuildFile section */
28 29
 
@@ -174,6 +175,13 @@
174 175
 			remoteGlobalIDString = 2D2A28131D9B038B00D4039D;
175 176
 			remoteInfo = "React-tvOS";
176 177
 		};
178
+		7BD721FD1E2E420400724059 /* PBXContainerItemProxy */ = {
179
+			isa = PBXContainerItemProxy;
180
+			containerPortal = 2647D6591DB175B300B23722 /* ReactNativeNavigation.xcodeproj */;
181
+			proxyType = 1;
182
+			remoteGlobalIDString = D8AFADBC1BEE6F3F00A4592D;
183
+			remoteInfo = ReactNativeNavigation;
184
+		};
177 185
 		832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */ = {
178 186
 			isa = PBXContainerItemProxy;
179 187
 			containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */;
@@ -213,6 +221,7 @@
213 221
 			isa = PBXFrameworksBuildPhase;
214 222
 			buildActionMask = 2147483647;
215 223
 			files = (
224
+				7BD721FF1E2E421E00724059 /* libReactNativeNavigation.a in Frameworks */,
216 225
 			);
217 226
 			runOnlyForDeploymentPostprocessing = 0;
218 227
 		};
@@ -426,6 +435,7 @@
426 435
 			buildRules = (
427 436
 			);
428 437
 			dependencies = (
438
+				7BD721FE1E2E420400724059 /* PBXTargetDependency */,
429 439
 				00E356F51AD99517003FC87E /* PBXTargetDependency */,
430 440
 			);
431 441
 			name = playgroundTests;
@@ -459,7 +469,7 @@
459 469
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
460 470
 			isa = PBXProject;
461 471
 			attributes = {
462
-				LastUpgradeCheck = 0610;
472
+				LastUpgradeCheck = 0820;
463 473
 				ORGANIZATIONNAME = Wix;
464 474
 				TargetAttributes = {
465 475
 					00E356ED1AD99517003FC87E = {
@@ -764,6 +774,11 @@
764 774
 			name = ReactNativeNavigation;
765 775
 			targetProxy = 7B1126BE1E2D2CE900F9B03B /* PBXContainerItemProxy */;
766 776
 		};
777
+		7BD721FE1E2E420400724059 /* PBXTargetDependency */ = {
778
+			isa = PBXTargetDependency;
779
+			name = ReactNativeNavigation;
780
+			targetProxy = 7BD721FD1E2E420400724059 /* PBXContainerItemProxy */;
781
+		};
767 782
 /* End PBXTargetDependency section */
768 783
 
769 784
 /* Begin PBXVariantGroup section */
@@ -782,10 +797,6 @@
782 797
 			isa = XCBuildConfiguration;
783 798
 			buildSettings = {
784 799
 				BUNDLE_LOADER = "$(TEST_HOST)";
785
-				FRAMEWORK_SEARCH_PATHS = (
786
-					"$(SDKROOT)/Developer/Library/Frameworks",
787
-					"$(inherited)",
788
-				);
789 800
 				GCC_PREPROCESSOR_DEFINITIONS = (
790 801
 					"DEBUG=1",
791 802
 					"$(inherited)",
@@ -799,6 +810,7 @@
799 810
 				INFOPLIST_FILE = playgroundTests/Info.plist;
800 811
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
801 812
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
813
+				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.playground.$(PRODUCT_NAME:rfc1034identifier)";
802 814
 				PRODUCT_NAME = "$(TARGET_NAME)";
803 815
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/playground.app/playground";
804 816
 			};
@@ -809,10 +821,6 @@
809 821
 			buildSettings = {
810 822
 				BUNDLE_LOADER = "$(TEST_HOST)";
811 823
 				COPY_PHASE_STRIP = NO;
812
-				FRAMEWORK_SEARCH_PATHS = (
813
-					"$(SDKROOT)/Developer/Library/Frameworks",
814
-					"$(inherited)",
815
-				);
816 824
 				HEADER_SEARCH_PATHS = (
817 825
 					"$(inherited)",
818 826
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@@ -822,6 +830,7 @@
822 830
 				INFOPLIST_FILE = playgroundTests/Info.plist;
823 831
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
824 832
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
833
+				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.playground.$(PRODUCT_NAME:rfc1034identifier)";
825 834
 				PRODUCT_NAME = "$(TARGET_NAME)";
826 835
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/playground.app/playground";
827 836
 			};
@@ -832,10 +841,6 @@
832 841
 			buildSettings = {
833 842
 				BUNDLE_LOADER = "$(TEST_HOST)";
834 843
 				COPY_PHASE_STRIP = NO;
835
-				FRAMEWORK_SEARCH_PATHS = (
836
-					"$(SDKROOT)/Developer/Library/Frameworks",
837
-					"$(inherited)",
838
-				);
839 844
 				HEADER_SEARCH_PATHS = (
840 845
 					"$(inherited)",
841 846
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@@ -845,6 +850,7 @@
845 850
 				INFOPLIST_FILE = playgroundTests/Info.plist;
846 851
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
847 852
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
853
+				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.playground.$(PRODUCT_NAME:rfc1034identifier)";
848 854
 				PRODUCT_NAME = "$(TARGET_NAME)";
849 855
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/playground.app/playground";
850 856
 			};
@@ -897,10 +903,6 @@
897 903
 			isa = XCBuildConfiguration;
898 904
 			buildSettings = {
899 905
 				BUNDLE_LOADER = "$(TEST_HOST)";
900
-				FRAMEWORK_SEARCH_PATHS = (
901
-					"$(SDKROOT)/Developer/Library/Frameworks",
902
-					"$(inherited)",
903
-				);
904 906
 				GCC_PREPROCESSOR_DEFINITIONS = (
905 907
 					"DEBUG=1",
906 908
 					"$(inherited)",
@@ -914,6 +916,7 @@
914 916
 				INFOPLIST_FILE = playgroundTests/Info.plist;
915 917
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
916 918
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
919
+				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.playground.$(PRODUCT_NAME:rfc1034identifier)";
917 920
 				PRODUCT_NAME = "$(TARGET_NAME)";
918 921
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/playground.app/playground";
919 922
 			};
@@ -960,8 +963,10 @@
960 963
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
961 964
 				CLANG_WARN_EMPTY_BODY = YES;
962 965
 				CLANG_WARN_ENUM_CONVERSION = YES;
966
+				CLANG_WARN_INFINITE_RECURSION = YES;
963 967
 				CLANG_WARN_INT_CONVERSION = YES;
964 968
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
969
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
965 970
 				CLANG_WARN_UNREACHABLE_CODE = YES;
966 971
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
967 972
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -969,6 +974,7 @@
969 974
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
970 975
 				GCC_C_LANGUAGE_STANDARD = gnu99;
971 976
 				GCC_DYNAMIC_NO_PIC = NO;
977
+				GCC_NO_COMMON_BLOCKS = YES;
972 978
 				GCC_OPTIMIZATION_LEVEL = 0;
973 979
 				GCC_PREPROCESSOR_DEFINITIONS = (
974 980
 					"DEBUG=1",
@@ -1007,8 +1013,10 @@
1007 1013
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
1008 1014
 				CLANG_WARN_EMPTY_BODY = YES;
1009 1015
 				CLANG_WARN_ENUM_CONVERSION = YES;
1016
+				CLANG_WARN_INFINITE_RECURSION = YES;
1010 1017
 				CLANG_WARN_INT_CONVERSION = YES;
1011 1018
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1019
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
1012 1020
 				CLANG_WARN_UNREACHABLE_CODE = YES;
1013 1021
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1014 1022
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -1016,6 +1024,7 @@
1016 1024
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
1017 1025
 				GCC_C_LANGUAGE_STANDARD = gnu99;
1018 1026
 				GCC_DYNAMIC_NO_PIC = NO;
1027
+				GCC_NO_COMMON_BLOCKS = YES;
1019 1028
 				GCC_OPTIMIZATION_LEVEL = 0;
1020 1029
 				GCC_PREPROCESSOR_DEFINITIONS = (
1021 1030
 					"DEBUG=1",
@@ -1054,8 +1063,10 @@
1054 1063
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
1055 1064
 				CLANG_WARN_EMPTY_BODY = YES;
1056 1065
 				CLANG_WARN_ENUM_CONVERSION = YES;
1066
+				CLANG_WARN_INFINITE_RECURSION = YES;
1057 1067
 				CLANG_WARN_INT_CONVERSION = YES;
1058 1068
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1069
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
1059 1070
 				CLANG_WARN_UNREACHABLE_CODE = YES;
1060 1071
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1061 1072
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -1063,6 +1074,7 @@
1063 1074
 				ENABLE_NS_ASSERTIONS = NO;
1064 1075
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
1065 1076
 				GCC_C_LANGUAGE_STANDARD = gnu99;
1077
+				GCC_NO_COMMON_BLOCKS = YES;
1066 1078
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
1067 1079
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
1068 1080
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -1095,8 +1107,10 @@
1095 1107
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
1096 1108
 				CLANG_WARN_EMPTY_BODY = YES;
1097 1109
 				CLANG_WARN_ENUM_CONVERSION = YES;
1110
+				CLANG_WARN_INFINITE_RECURSION = YES;
1098 1111
 				CLANG_WARN_INT_CONVERSION = YES;
1099 1112
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1113
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
1100 1114
 				CLANG_WARN_UNREACHABLE_CODE = YES;
1101 1115
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1102 1116
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -1104,6 +1118,7 @@
1104 1118
 				ENABLE_NS_ASSERTIONS = NO;
1105 1119
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
1106 1120
 				GCC_C_LANGUAGE_STANDARD = gnu99;
1121
+				GCC_NO_COMMON_BLOCKS = YES;
1107 1122
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
1108 1123
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
1109 1124
 				GCC_WARN_UNDECLARED_SELECTOR = YES;

+ 1
- 1
playground/ios/playground.xcodeproj/xcshareddata/xcschemes/playground.xcscheme Целия файл

@@ -1,6 +1,6 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <Scheme
3
-   LastUpgradeVersion = "0620"
3
+   LastUpgradeVersion = "0820"
4 4
    version = "1.3">
5 5
    <BuildAction
6 6
       parallelizeBuildables = "YES"

+ 1
- 1
playground/ios/playground.xcodeproj/xcshareddata/xcschemes/playground_Detox.xcscheme Целия файл

@@ -1,6 +1,6 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <Scheme
3
-   LastUpgradeVersion = "0620"
3
+   LastUpgradeVersion = "0820"
4 4
    version = "1.3">
5 5
    <BuildAction
6 6
       parallelizeBuildables = "YES"

+ 1
- 1
playground/ios/playgroundTests/Info.plist Целия файл

@@ -7,7 +7,7 @@
7 7
 	<key>CFBundleExecutable</key>
8 8
 	<string>$(EXECUTABLE_NAME)</string>
9 9
 	<key>CFBundleIdentifier</key>
10
-	<string>org.reactjs.native.playground.$(PRODUCT_NAME:rfc1034identifier)</string>
10
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11 11
 	<key>CFBundleInfoDictionaryVersion</key>
12 12
 	<string>6.0</string>
13 13
 	<key>CFBundleName</key>