Browse Source

migrating to RN41.2

Daniel Zlotin 7 years ago
parent
commit
503eef523b

+ 117
- 56
example/ios/example.xcodeproj/project.pbxproj View File

@@ -7,23 +7,23 @@
7 7
 	objects = {
8 8
 
9 9
 /* Begin PBXBuildFile section */
10
-		00C302E51ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
11
-		00C302E71ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
12
-		00C302E81ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
13
-		00C302E91ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
14
-		00C302EA1ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
10
+		00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
11
+		00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
12
+		00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
13
+		00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
14
+		00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
15 15
 		00E356F31AD99517003FC87E /* exampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* exampleTests.m */; };
16
-		133E29F31AD74F7200F7D852 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
17
-		139105C61AF99C1200B5F7CC /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
18
-		139FDEF61B0652A700C62182 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
16
+		133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
17
+		139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
18
+		139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
19 19
 		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
20 20
 		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
21 21
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
22 22
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
23
-		146834051AC3E58100842450 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
24
-		2647D65F1DB175C200B23722 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
25
-		7B9B39861DEB4091004A6281 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B9B39631DEB4076004A6281 /* libRCTAnimation.a */; };
26
-		832341BD1AAA6AB300B99B32 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
23
+		146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
24
+		2647D65F1DB175C200B23722 /* libReactNativeNavigation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
25
+		7B9B39861DEB4091004A6281 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B9B39631DEB4076004A6281 /* libRCTAnimation.a */; };
26
+		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
27 27
 /* End PBXBuildFile section */
28 28
 
29 29
 /* Begin PBXContainerItemProxy section */
@@ -167,6 +167,48 @@
167 167
 			remoteGlobalIDString = 2D2A28131D9B038B00D4039D;
168 168
 			remoteInfo = "React-tvOS";
169 169
 		};
170
+		7BFF94261E5F10F20054957C /* PBXContainerItemProxy */ = {
171
+			isa = PBXContainerItemProxy;
172
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
173
+			proxyType = 2;
174
+			remoteGlobalIDString = 3D3C059A1DE3340900C268FA;
175
+			remoteInfo = yoga;
176
+		};
177
+		7BFF94281E5F10F20054957C /* PBXContainerItemProxy */ = {
178
+			isa = PBXContainerItemProxy;
179
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
180
+			proxyType = 2;
181
+			remoteGlobalIDString = 3D3C06751DE3340C00C268FA;
182
+			remoteInfo = "yoga-tvOS";
183
+		};
184
+		7BFF942A1E5F10F20054957C /* PBXContainerItemProxy */ = {
185
+			isa = PBXContainerItemProxy;
186
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
187
+			proxyType = 2;
188
+			remoteGlobalIDString = 3D3CD9251DE5FBEC00167DC4;
189
+			remoteInfo = cxxreact;
190
+		};
191
+		7BFF942C1E5F10F20054957C /* PBXContainerItemProxy */ = {
192
+			isa = PBXContainerItemProxy;
193
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
194
+			proxyType = 2;
195
+			remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4;
196
+			remoteInfo = "cxxreact-tvOS";
197
+		};
198
+		7BFF942E1E5F10F20054957C /* PBXContainerItemProxy */ = {
199
+			isa = PBXContainerItemProxy;
200
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
201
+			proxyType = 2;
202
+			remoteGlobalIDString = 3D3CD90B1DE5FBD600167DC4;
203
+			remoteInfo = jschelpers;
204
+		};
205
+		7BFF94301E5F10F20054957C /* PBXContainerItemProxy */ = {
206
+			isa = PBXContainerItemProxy;
207
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
208
+			proxyType = 2;
209
+			remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4;
210
+			remoteInfo = "jschelpers-tvOS";
211
+		};
170 212
 		832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */ = {
171 213
 			isa = PBXContainerItemProxy;
172 214
 			containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */;
@@ -214,18 +256,18 @@
214 256
 			isa = PBXFrameworksBuildPhase;
215 257
 			buildActionMask = 2147483647;
216 258
 			files = (
217
-				7B9B39861DEB4091004A6281 /* ReferenceProxy in Frameworks */,
218
-				2647D65F1DB175C200B23722 /* ReferenceProxy in Frameworks */,
219
-				146834051AC3E58100842450 /* ReferenceProxy in Frameworks */,
220
-				00C302E51ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
221
-				00C302E71ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
222
-				00C302E81ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
223
-				133E29F31AD74F7200F7D852 /* ReferenceProxy in Frameworks */,
224
-				00C302E91ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
225
-				139105C61AF99C1200B5F7CC /* ReferenceProxy in Frameworks */,
226
-				832341BD1AAA6AB300B99B32 /* ReferenceProxy in Frameworks */,
227
-				00C302EA1ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
228
-				139FDEF61B0652A700C62182 /* ReferenceProxy in Frameworks */,
259
+				7B9B39861DEB4091004A6281 /* libRCTAnimation.a in Frameworks */,
260
+				2647D65F1DB175C200B23722 /* libReactNativeNavigation.a in Frameworks */,
261
+				146834051AC3E58100842450 /* libReact.a in Frameworks */,
262
+				00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
263
+				00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */,
264
+				00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */,
265
+				133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */,
266
+				00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */,
267
+				139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */,
268
+				832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
269
+				00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
270
+				139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
229 271
 			);
230 272
 			runOnlyForDeploymentPostprocessing = 0;
231 273
 		};
@@ -327,7 +369,13 @@
327 369
 			isa = PBXGroup;
328 370
 			children = (
329 371
 				146834041AC3E56700842450 /* libReact.a */,
330
-				7B9B39831DEB4076004A6281 /* libReact-tvOS.a */,
372
+				7B9B39831DEB4076004A6281 /* libReact.a */,
373
+				7BFF94271E5F10F20054957C /* libyoga.a */,
374
+				7BFF94291E5F10F20054957C /* libyoga.a */,
375
+				7BFF942B1E5F10F20054957C /* libcxxreact.a */,
376
+				7BFF942D1E5F10F20054957C /* libcxxreact.a */,
377
+				7BFF942F1E5F10F20054957C /* libjschelpers.a */,
378
+				7BFF94311E5F10F20054957C /* libjschelpers.a */,
331 379
 			);
332 380
 			name = Products;
333 381
 			sourceTree = "<group>";
@@ -658,13 +706,55 @@
658 706
 			remoteRef = 7B9B397E1DEB4076004A6281 /* PBXContainerItemProxy */;
659 707
 			sourceTree = BUILT_PRODUCTS_DIR;
660 708
 		};
661
-		7B9B39831DEB4076004A6281 /* libReact-tvOS.a */ = {
709
+		7B9B39831DEB4076004A6281 /* libReact.a */ = {
662 710
 			isa = PBXReferenceProxy;
663 711
 			fileType = archive.ar;
664
-			path = "libReact-tvOS.a";
712
+			path = libReact.a;
665 713
 			remoteRef = 7B9B39821DEB4076004A6281 /* PBXContainerItemProxy */;
666 714
 			sourceTree = BUILT_PRODUCTS_DIR;
667 715
 		};
716
+		7BFF94271E5F10F20054957C /* libyoga.a */ = {
717
+			isa = PBXReferenceProxy;
718
+			fileType = archive.ar;
719
+			path = libyoga.a;
720
+			remoteRef = 7BFF94261E5F10F20054957C /* PBXContainerItemProxy */;
721
+			sourceTree = BUILT_PRODUCTS_DIR;
722
+		};
723
+		7BFF94291E5F10F20054957C /* libyoga.a */ = {
724
+			isa = PBXReferenceProxy;
725
+			fileType = archive.ar;
726
+			path = libyoga.a;
727
+			remoteRef = 7BFF94281E5F10F20054957C /* PBXContainerItemProxy */;
728
+			sourceTree = BUILT_PRODUCTS_DIR;
729
+		};
730
+		7BFF942B1E5F10F20054957C /* libcxxreact.a */ = {
731
+			isa = PBXReferenceProxy;
732
+			fileType = archive.ar;
733
+			path = libcxxreact.a;
734
+			remoteRef = 7BFF942A1E5F10F20054957C /* PBXContainerItemProxy */;
735
+			sourceTree = BUILT_PRODUCTS_DIR;
736
+		};
737
+		7BFF942D1E5F10F20054957C /* libcxxreact.a */ = {
738
+			isa = PBXReferenceProxy;
739
+			fileType = archive.ar;
740
+			path = libcxxreact.a;
741
+			remoteRef = 7BFF942C1E5F10F20054957C /* PBXContainerItemProxy */;
742
+			sourceTree = BUILT_PRODUCTS_DIR;
743
+		};
744
+		7BFF942F1E5F10F20054957C /* libjschelpers.a */ = {
745
+			isa = PBXReferenceProxy;
746
+			fileType = archive.ar;
747
+			path = libjschelpers.a;
748
+			remoteRef = 7BFF942E1E5F10F20054957C /* PBXContainerItemProxy */;
749
+			sourceTree = BUILT_PRODUCTS_DIR;
750
+		};
751
+		7BFF94311E5F10F20054957C /* libjschelpers.a */ = {
752
+			isa = PBXReferenceProxy;
753
+			fileType = archive.ar;
754
+			path = libjschelpers.a;
755
+			remoteRef = 7BFF94301E5F10F20054957C /* PBXContainerItemProxy */;
756
+			sourceTree = BUILT_PRODUCTS_DIR;
757
+		};
668 758
 		832341B51AAA6A8300B99B32 /* libRCTText.a */ = {
669 759
 			isa = PBXReferenceProxy;
670 760
 			fileType = archive.ar;
@@ -721,7 +811,6 @@
721 811
 			runOnlyForDeploymentPostprocessing = 0;
722 812
 			shellPath = /bin/bash;
723 813
 			shellScript = "if [ -n \"$DEPLOY_DETOX_FRAMEWORK\" ]; then\nmkdir -p \"${BUILT_PRODUCTS_DIR}\"/\"${FRAMEWORKS_FOLDER_PATH}\"\ncp -r \"${PROJECT_DIR}\"/../node_modules/detox/Detox.framework \"${BUILT_PRODUCTS_DIR}\"/\"${FRAMEWORKS_FOLDER_PATH}\"\nfi";
724
-			showEnvVarsInLog = 1;
725 814
 		};
726 815
 /* End PBXShellScriptBuildPhase section */
727 816
 
@@ -810,8 +899,6 @@
810 899
 				DEAD_CODE_STRIPPING = NO;
811 900
 				HEADER_SEARCH_PATHS = (
812 901
 					"$(inherited)",
813
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
814
-					"$(SRCROOT)/../node_modules/react-native/React/**",
815 902
 					"$(SRCROOT)/../node_modules/react-native-navigation/ios/**",
816 903
 				);
817 904
 				INFOPLIST_FILE = example/Info.plist;
@@ -831,8 +918,6 @@
831 918
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
832 919
 				HEADER_SEARCH_PATHS = (
833 920
 					"$(inherited)",
834
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
835
-					"$(SRCROOT)/../node_modules/react-native/React/**",
836 921
 					"$(SRCROOT)/../node_modules/react-native-navigation/ios/**",
837 922
 				);
838 923
 				INFOPLIST_FILE = example/Info.plist;
@@ -880,11 +965,6 @@
880 965
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
881 966
 				GCC_WARN_UNUSED_FUNCTION = YES;
882 967
 				GCC_WARN_UNUSED_VARIABLE = YES;
883
-				HEADER_SEARCH_PATHS = (
884
-					"$(inherited)",
885
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
886
-					"$(SRCROOT)/../node_modules/react-native/React/**",
887
-				);
888 968
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
889 969
 				MTL_ENABLE_DEBUG_INFO = YES;
890 970
 				ONLY_ACTIVE_ARCH = YES;
@@ -947,11 +1027,6 @@
947 1027
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
948 1028
 				GCC_WARN_UNUSED_FUNCTION = YES;
949 1029
 				GCC_WARN_UNUSED_VARIABLE = YES;
950
-				HEADER_SEARCH_PATHS = (
951
-					"$(inherited)",
952
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
953
-					"$(SRCROOT)/../node_modules/react-native/React/**",
954
-				);
955 1030
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
956 1031
 				MTL_ENABLE_DEBUG_INFO = YES;
957 1032
 				ONLY_ACTIVE_ARCH = YES;
@@ -988,11 +1063,6 @@
988 1063
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
989 1064
 				GCC_WARN_UNUSED_FUNCTION = YES;
990 1065
 				GCC_WARN_UNUSED_VARIABLE = YES;
991
-				HEADER_SEARCH_PATHS = (
992
-					"$(inherited)",
993
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
994
-					"$(SRCROOT)/../node_modules/react-native/React/**",
995
-				);
996 1066
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
997 1067
 				MTL_ENABLE_DEBUG_INFO = NO;
998 1068
 				OTHER_LDFLAGS = "";
@@ -1012,8 +1082,6 @@
1012 1082
 				);
1013 1083
 				HEADER_SEARCH_PATHS = (
1014 1084
 					"$(inherited)",
1015
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
1016
-					"$(SRCROOT)/../node_modules/react-native/React/**",
1017 1085
 					"$(SRCROOT)/../node_modules/react-native-navigation/ios/**",
1018 1086
 				);
1019 1087
 				INFOPLIST_FILE = example/Info.plist;
@@ -1041,8 +1109,6 @@
1041 1109
 				);
1042 1110
 				HEADER_SEARCH_PATHS = (
1043 1111
 					"$(inherited)",
1044
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
1045
-					"$(SRCROOT)/../node_modules/react-native/React/**",
1046 1112
 					"$(SRCROOT)/../node_modules/react-native-navigation/ios/**",
1047 1113
 				);
1048 1114
 				INFOPLIST_FILE = example/Info.plist;
@@ -1103,11 +1169,6 @@
1103 1169
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
1104 1170
 				GCC_WARN_UNUSED_FUNCTION = YES;
1105 1171
 				GCC_WARN_UNUSED_VARIABLE = YES;
1106
-				HEADER_SEARCH_PATHS = (
1107
-					"$(inherited)",
1108
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
1109
-					"$(SRCROOT)/../node_modules/react-native/React/**",
1110
-				);
1111 1172
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1112 1173
 				MTL_ENABLE_DEBUG_INFO = NO;
1113 1174
 				OTHER_LDFLAGS = "";

+ 15
- 1
example/ios/example.xcodeproj/xcshareddata/xcschemes/example.xcscheme View File

@@ -3,9 +3,23 @@
3 3
    LastUpgradeVersion = "0620"
4 4
    version = "1.3">
5 5
    <BuildAction
6
-      parallelizeBuildables = "YES"
6
+      parallelizeBuildables = "NO"
7 7
       buildImplicitDependencies = "YES">
8 8
       <BuildActionEntries>
9
+         <BuildActionEntry
10
+            buildForTesting = "YES"
11
+            buildForRunning = "YES"
12
+            buildForProfiling = "YES"
13
+            buildForArchiving = "YES"
14
+            buildForAnalyzing = "YES">
15
+            <BuildableReference
16
+               BuildableIdentifier = "primary"
17
+               BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
18
+               BuildableName = "libReact.a"
19
+               BlueprintName = "React"
20
+               ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
21
+            </BuildableReference>
22
+         </BuildActionEntry>
9 23
          <BuildActionEntry
10 24
             buildForTesting = "YES"
11 25
             buildForRunning = "YES"

+ 15
- 1
example/ios/example.xcodeproj/xcshareddata/xcschemes/example_Detox.xcscheme View File

@@ -3,9 +3,23 @@
3 3
    LastUpgradeVersion = "0620"
4 4
    version = "1.3">
5 5
    <BuildAction
6
-      parallelizeBuildables = "YES"
6
+      parallelizeBuildables = "NO"
7 7
       buildImplicitDependencies = "YES">
8 8
       <BuildActionEntries>
9
+         <BuildActionEntry
10
+            buildForTesting = "YES"
11
+            buildForRunning = "YES"
12
+            buildForProfiling = "YES"
13
+            buildForArchiving = "YES"
14
+            buildForAnalyzing = "YES">
15
+            <BuildableReference
16
+               BuildableIdentifier = "primary"
17
+               BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
18
+               BuildableName = "libReact.a"
19
+               BlueprintName = "React"
20
+               ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
21
+            </BuildableReference>
22
+         </BuildActionEntry>
9 23
          <BuildActionEntry
10 24
             buildForTesting = "YES"
11 25
             buildForRunning = "YES"

+ 15
- 1
example/ios/example.xcodeproj/xcshareddata/xcschemes/example_release.xcscheme View File

@@ -3,9 +3,23 @@
3 3
    LastUpgradeVersion = "0620"
4 4
    version = "1.3">
5 5
    <BuildAction
6
-      parallelizeBuildables = "YES"
6
+      parallelizeBuildables = "NO"
7 7
       buildImplicitDependencies = "YES">
8 8
       <BuildActionEntries>
9
+         <BuildActionEntry
10
+            buildForTesting = "YES"
11
+            buildForRunning = "YES"
12
+            buildForProfiling = "YES"
13
+            buildForArchiving = "YES"
14
+            buildForAnalyzing = "YES">
15
+            <BuildableReference
16
+               BuildableIdentifier = "primary"
17
+               BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
18
+               BuildableName = "libReact.a"
19
+               BlueprintName = "React"
20
+               ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
21
+            </BuildableReference>
22
+         </BuildActionEntry>
9 23
          <BuildActionEntry
10 24
             buildForTesting = "YES"
11 25
             buildForRunning = "YES"

+ 2
- 2
example/package.json View File

@@ -10,8 +10,8 @@
10 10
     "e2e": "node ./scripts/e2e.ios.js"
11 11
   },
12 12
   "dependencies": {
13
-    "react-native": "0.38.0",
14
-    "react": "15.4.1",
13
+    "react-native": "0.41.2",
14
+    "react": "15.4.2",
15 15
     "react-native-navigation": "file:../"
16 16
   },
17 17
   "devDependencies": {

+ 0
- 16
ios/ReactNativeNavigation.xcodeproj/project.pbxproj View File

@@ -359,10 +359,6 @@
359 359
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
360 360
 				GCC_WARN_UNUSED_FUNCTION = YES;
361 361
 				GCC_WARN_UNUSED_VARIABLE = YES;
362
-				HEADER_SEARCH_PATHS = (
363
-					"$(inherited)",
364
-					"$(SRCROOT)/../../react-native/React/**",
365
-				);
366 362
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
367 363
 				MTL_ENABLE_DEBUG_INFO = YES;
368 364
 				ONLY_ACTIVE_ARCH = YES;
@@ -400,10 +396,6 @@
400 396
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
401 397
 				GCC_WARN_UNUSED_FUNCTION = YES;
402 398
 				GCC_WARN_UNUSED_VARIABLE = YES;
403
-				HEADER_SEARCH_PATHS = (
404
-					"$(inherited)",
405
-					"$(SRCROOT)/../../react-native/React/**",
406
-				);
407 399
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
408 400
 				MTL_ENABLE_DEBUG_INFO = NO;
409 401
 				SDKROOT = iphoneos;
@@ -414,10 +406,6 @@
414 406
 		D8AFADC71BEE6F3F00A4592D /* Debug */ = {
415 407
 			isa = XCBuildConfiguration;
416 408
 			buildSettings = {
417
-				HEADER_SEARCH_PATHS = (
418
-					"$(inherited)",
419
-					"$(SRCROOT)/../../react-native/React/**",
420
-				);
421 409
 				OTHER_LDFLAGS = "-ObjC";
422 410
 				PRODUCT_NAME = ReactNativeNavigation;
423 411
 				SKIP_INSTALL = YES;
@@ -427,10 +415,6 @@
427 415
 		D8AFADC81BEE6F3F00A4592D /* Release */ = {
428 416
 			isa = XCBuildConfiguration;
429 417
 			buildSettings = {
430
-				HEADER_SEARCH_PATHS = (
431
-					"$(inherited)",
432
-					"$(SRCROOT)/../../react-native/React/**",
433
-				);
434 418
 				OTHER_LDFLAGS = "-ObjC";
435 419
 				PRODUCT_NAME = ReactNativeNavigation;
436 420
 				SKIP_INSTALL = YES;

+ 3
- 3
package.json View File

@@ -40,8 +40,8 @@
40 40
     "lodash": "4.x.x"
41 41
   },
42 42
   "devDependencies": {
43
-    "react-native": "0.38.0",
44
-    "react": "15.4.1",
43
+    "react-native": "0.41.2",
44
+    "react": "15.4.2",
45 45
     "babel-cli": "6.x.x",
46 46
     "babel-core": "6.x.x",
47 47
     "babel-polyfill": "6.x.x",
@@ -55,7 +55,7 @@
55 55
     "jest": "18.x.x",
56 56
     "jest-cli": "18.x.x",
57 57
     "jest-react-native": "18.x.x",
58
-    "react-test-renderer": "15.4.1",
58
+    "react-test-renderer": "15.4.2",
59 59
     "semver": "5.x.x"
60 60
   },
61 61
   "jest": {

+ 632
- 1763
yarn.lock
File diff suppressed because it is too large
View File