Skip to content

Commit fd144a2

Browse files
javacheMartin Konicek
javache
authored and
Martin Konicek
committed
Fix target configuration in React.xcodeproj
Summary: The target config inside React.xcodeproj was messed up, with source files being included in multiple or wrong targets. I went over the files in React.xcodeproj and verified that each .m file was included only once and was in the right target and .h were in the right projects. Reviewed By: majak Differential Revision: D4284673 fbshipit-source-id: 99af61083c6ca81311e30f0ea0045d4e7bffc20c
1 parent ed3b71f commit fd144a2

File tree

1 file changed

+16
-28
lines changed

1 file changed

+16
-28
lines changed

‎React/React.xcodeproj/project.pbxproj

+16-28
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@
155155
2D3B5EEF1D9B09DC00451313 /* RCTViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E0674E1A70F44B002CDEE1 /* RCTViewManager.m */; };
156156
2D3B5EF01D9B09E300451313 /* RCTWrapperViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B080241A694A8400A75B9A /* RCTWrapperViewController.m */; };
157157
2D3B5EF11D9B09E700451313 /* UIView+React.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E067541A70F44B002CDEE1 /* UIView+React.m */; };
158-
2D537FD21DA4809D000F876C /* (null) in Sources */ = {isa = PBXBuildFile; };
159158
2D74EAFA1DAE9590003B751B /* RCTMultipartDataTask.m in Sources */ = {isa = PBXBuildFile; fileRef = 006FC4131D9B20820057AAAD /* RCTMultipartDataTask.m */; };
160159
2D8C2E331DA40441000EE098 /* RCTMultipartStreamReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 001BFCCF1D8381DE008E587E /* RCTMultipartStreamReader.m */; };
161160
2DD0EFE11DA84F2800B0C975 /* RCTStatusBarManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13723B4F1A82FD3C00F88898 /* RCTStatusBarManager.m */; };
@@ -194,15 +193,6 @@
194193
3D3C085F1DE33E6100C268FA /* YGNodeList.c in Sources */ = {isa = PBXBuildFile; fileRef = 1321C8CE1D3EB50800D58318 /* YGNodeList.c */; };
195194
3D3C08891DE342FB00C268FA /* libCSSLayout.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D3C059A1DE3340900C268FA /* libCSSLayout.a */; };
196195
3D3C088C1DE3430500C268FA /* libCSSLayout-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D3C06751DE3340C00C268FA /* libCSSLayout-tvOS.a */; };
197-
3D3CD8F81DE5FB2D00167DC4 /* JSBundleType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2EB1DE48A22002E6351 /* JSBundleType.cpp */; };
198-
3D3CD9061DE5FBD600167DC4 /* Yoga.c in Sources */ = {isa = PBXBuildFile; fileRef = 133683441D37ACA10077D0C3 /* Yoga.c */; };
199-
3D3CD9071DE5FBD600167DC4 /* YGNodeList.c in Sources */ = {isa = PBXBuildFile; fileRef = 1321C8CE1D3EB50800D58318 /* YGNodeList.c */; };
200-
3D3CD9131DE5FBD800167DC4 /* Yoga.c in Sources */ = {isa = PBXBuildFile; fileRef = 133683441D37ACA10077D0C3 /* Yoga.c */; };
201-
3D3CD9141DE5FBD800167DC4 /* YGNodeList.c in Sources */ = {isa = PBXBuildFile; fileRef = 1321C8CE1D3EB50800D58318 /* YGNodeList.c */; };
202-
3D3CD9201DE5FBEC00167DC4 /* Yoga.c in Sources */ = {isa = PBXBuildFile; fileRef = 133683441D37ACA10077D0C3 /* Yoga.c */; };
203-
3D3CD9211DE5FBEC00167DC4 /* YGNodeList.c in Sources */ = {isa = PBXBuildFile; fileRef = 1321C8CE1D3EB50800D58318 /* YGNodeList.c */; };
204-
3D3CD92D1DE5FBEE00167DC4 /* Yoga.c in Sources */ = {isa = PBXBuildFile; fileRef = 133683441D37ACA10077D0C3 /* Yoga.c */; };
205-
3D3CD92E1DE5FBEE00167DC4 /* YGNodeList.c in Sources */ = {isa = PBXBuildFile; fileRef = 1321C8CE1D3EB50800D58318 /* YGNodeList.c */; };
206196
3D3CD93D1DE5FC1400167DC4 /* JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */; settings = {ATTRIBUTES = (Public, ); }; };
207197
3D3CD93E1DE5FC1400167DC4 /* JSCWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DE1DE32541002E3F95 /* JSCWrapper.h */; settings = {ATTRIBUTES = (Public, ); }; };
208198
3D3CD93F1DE5FC1400167DC4 /* JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -449,10 +439,13 @@
449439
3D5FA6881DE4B9B30058FD77 /* RCTJSCWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 85C199EC1CD2407900DAD810 /* RCTJSCWrapper.h */; };
450440
3D5FA6891DE4B9B30058FD77 /* RCTJSCWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 85C199EC1CD2407900DAD810 /* RCTJSCWrapper.h */; };
451441
3D7749441DC1065C007EC8D8 /* RCTPlatform.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7749431DC1065C007EC8D8 /* RCTPlatform.m */; };
452-
3D7A27DF1DE32541002E3F95 /* JSCWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D7A27DD1DE32541002E3F95 /* JSCWrapper.cpp */; };
453-
3D7A27E01DE32559002E3F95 /* JSCWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D7A27DD1DE32541002E3F95 /* JSCWrapper.cpp */; };
454442
3D7A27E21DE325B7002E3F95 /* RCTJSCErrorHandling.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D7A27E11DE325B7002E3F95 /* RCTJSCErrorHandling.mm */; };
455443
3D7A27E31DE325DA002E3F95 /* RCTJSCErrorHandling.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D7A27E11DE325B7002E3F95 /* RCTJSCErrorHandling.mm */; };
444+
3D80D9171DF6F7A80028D040 /* JSBundleType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2EB1DE48A22002E6351 /* JSBundleType.cpp */; };
445+
3D80D9181DF6F7A80028D040 /* JSBundleType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2EB1DE48A22002E6351 /* JSBundleType.cpp */; };
446+
3D80D9191DF6F7CF0028D040 /* JSCWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D7A27DD1DE32541002E3F95 /* JSCWrapper.cpp */; };
447+
3D80D91A1DF6F7CF0028D040 /* JSCWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D7A27DD1DE32541002E3F95 /* JSCWrapper.cpp */; };
448+
3D80D91B1DF6F8200028D040 /* RCTPlatform.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7749431DC1065C007EC8D8 /* RCTPlatform.m */; };
456449
3DDEC1521DDCE0CA0020BBDF /* JSCSamplingProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 369123E01DDC75850095B341 /* JSCSamplingProfiler.m */; };
457450
3EDCA8A51D3591E700450C31 /* RCTErrorInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EDCA8A41D3591E700450C31 /* RCTErrorInfo.m */; };
458451
58114A161AAE854800E7D092 /* RCTPicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 58114A131AAE854800E7D092 /* RCTPicker.m */; };
@@ -472,7 +465,6 @@
472465
83CBBA981A6020BB00E9B192 /* RCTTouchHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 83CBBA971A6020BB00E9B192 /* RCTTouchHandler.m */; };
473466
83CBBACC1A6023D300E9B192 /* RCTConvert.m in Sources */ = {isa = PBXBuildFile; fileRef = 83CBBACB1A6023D300E9B192 /* RCTConvert.m */; };
474467
AC70D2E91DE489E4002E6351 /* RCTJavaScriptLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */; };
475-
AC70D2ED1DE48A22002E6351 /* JSBundleType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2EB1DE48A22002E6351 /* JSBundleType.cpp */; };
476468
B233E6EA1D2D845D00BC68BA /* RCTI18nManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B233E6E91D2D845D00BC68BA /* RCTI18nManager.m */; };
477469
B95154321D1B34B200FE7B80 /* RCTActivityIndicatorView.m in Sources */ = {isa = PBXBuildFile; fileRef = B95154311D1B34B200FE7B80 /* RCTActivityIndicatorView.m */; };
478470
E9B20B7B1B500126007A2DA7 /* RCTAccessibilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9B20B7A1B500126007A2DA7 /* RCTAccessibilityManager.m */; };
@@ -1515,7 +1507,7 @@
15151507
3D4546211DE32FE200C6C478 /* Headers */,
15161508
2D2A280F1D9B038B00D4039D /* Sources */,
15171509
3D3C088B1DE342FE00C268FA /* Frameworks */,
1518-
2D6948201DA3042200B3FA97 /* ShellScript */,
1510+
2D6948201DA3042200B3FA97 /* Run Script */,
15191511
);
15201512
buildRules = (
15211513
);
@@ -1704,6 +1696,7 @@
17041696
runOnlyForDeploymentPostprocessing = 0;
17051697
shellPath = /bin/sh;
17061698
shellScript = "if [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n if nc -w 5 -z localhost 8081 ; then\n if ! curl -s \"http://localhost:8081/status\" | grep -q \"packager-status:running\" ; then\n echo \"Port 8081 already in use, packager is either not running or not running correctly\"\n exit 2\n fi\n else\n open \"$SRCROOT/../packager/launchPackager.command\" || echo \"Can't start packager automatically\"\n fi\nfi";
1699+
showEnvVarsInLog = 0;
17071700
};
17081701
142C4F7F1B582EA6001F0B58 /* ShellScript */ = {
17091702
isa = PBXShellScriptBuildPhase;
@@ -1719,18 +1712,20 @@
17191712
shellScript = "if [[ \"$CONFIGURATION\" == \"Debug\" ]] && [[ -d \"/tmp/RCTJSCProfiler\" ]]; then\n find \"${CONFIGURATION_BUILD_DIR}\" -name '*.app' | xargs -I{} sh -c 'cp -r /tmp/RCTJSCProfiler \"$1\"' -- {}\nfi";
17201713
showEnvVarsInLog = 0;
17211714
};
1722-
2D6948201DA3042200B3FA97 /* ShellScript */ = {
1715+
2D6948201DA3042200B3FA97 /* Run Script */ = {
17231716
isa = PBXShellScriptBuildPhase;
17241717
buildActionMask = 2147483647;
17251718
files = (
17261719
);
17271720
inputPaths = (
17281721
);
1722+
name = "Run Script";
17291723
outputPaths = (
17301724
);
17311725
runOnlyForDeploymentPostprocessing = 0;
17321726
shellPath = /bin/sh;
17331727
shellScript = "if [[ \"$CONFIGURATION\" == \"Debug\" ]] && [[ -d \"/tmp/RCTJSCProfiler\" ]]; then\nfind \"${CONFIGURATION_BUILD_DIR}\" -name '*.app' | xargs -I{} sh -c 'cp -r /tmp/RCTJSCProfiler \"$1\"' -- {}\nfi";
1728+
showEnvVarsInLog = 0;
17341729
};
17351730
2D6948301DA3088700B3FA97 /* ShellScript */ = {
17361731
isa = PBXShellScriptBuildPhase;
@@ -1744,6 +1739,7 @@
17441739
runOnlyForDeploymentPostprocessing = 0;
17451740
shellPath = /bin/sh;
17461741
shellScript = "if [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\nif nc -w 5 -z localhost 8081 ; then\nif ! curl -s \"http://localhost:8081/status\" | grep -q \"packager-status:running\" ; then\necho \"Port 8081 already in use, packager is either not running or not running correctly\"\nexit 2\nfi\nelse\nopen \"$SRCROOT/../packager/launchPackager.command\" || echo \"Can't start packager automatically\"\nfi\nfi";
1742+
showEnvVarsInLog = 0;
17471743
};
17481744
/* End PBXShellScriptBuildPhase section */
17491745

@@ -1752,6 +1748,7 @@
17521748
isa = PBXSourcesBuildPhase;
17531749
buildActionMask = 2147483647;
17541750
files = (
1751+
3D80D91B1DF6F8200028D040 /* RCTPlatform.m in Sources */,
17551752
2DD0EFE11DA84F2800B0C975 /* RCTStatusBarManager.m in Sources */,
17561753
2D3B5EC91D9B095C00451313 /* RCTBorderDrawing.m in Sources */,
17571754
2D3B5ED31D9B097B00451313 /* RCTMapOverlay.m in Sources */,
@@ -1775,7 +1772,6 @@
17751772
2D3B5EB71D9B091800451313 /* RCTRedBox.m in Sources */,
17761773
2D3B5ED11D9B097500451313 /* RCTMapAnnotation.m in Sources */,
17771774
2D3B5EAF1D9B08FB00451313 /* RCTAccessibilityManager.m in Sources */,
1778-
2D537FD21DA4809D000F876C /* (null) in Sources */,
17791775
2D3B5EF11D9B09E700451313 /* UIView+React.m in Sources */,
17801776
2D3B5E931D9B087300451313 /* RCTErrorInfo.m in Sources */,
17811777
2D3B5EE01D9B09AD00451313 /* RCTRootShadowView.m in Sources */,
@@ -1791,7 +1787,6 @@
17911787
2D3B5EEB1D9B09D000451313 /* RCTTabBarItem.m in Sources */,
17921788
2D3B5E961D9B088500451313 /* RCTBatchedBridge.m in Sources */,
17931789
2D3B5ED41D9B097D00451313 /* RCTModalHostView.m in Sources */,
1794-
3D7A27E01DE32559002E3F95 /* JSCWrapper.cpp in Sources */,
17951790
2D3B5E9F1D9B08AF00451313 /* RCTKeyCommands.m in Sources */,
17961791
2D3B5EA51D9B08C700451313 /* RCTRootView.m in Sources */,
17971792
2D3B5EAC1D9B08EF00451313 /* RCTJSCExecutor.mm in Sources */,
@@ -1809,7 +1804,6 @@
18091804
2D3B5EB81D9B091B00451313 /* RCTSourceCode.m in Sources */,
18101805
2D3B5EB51D9B091100451313 /* RCTDevMenu.m in Sources */,
18111806
2D3B5EBD1D9B092A00451313 /* RCTTiming.m in Sources */,
1812-
3D3CD8F81DE5FB2D00167DC4 /* JSBundleType.cpp in Sources */,
18131807
2D3B5EA81D9B08D300451313 /* RCTUtils.m in Sources */,
18141808
2D3B5EC81D9B095800451313 /* RCTActivityIndicatorViewManager.m in Sources */,
18151809
2D3B5EC61D9B095000451313 /* RCTProfileTrampoline-x86_64.S in Sources */,
@@ -1864,35 +1858,31 @@
18641858
isa = PBXSourcesBuildPhase;
18651859
buildActionMask = 2147483647;
18661860
files = (
1867-
3D3CD9061DE5FBD600167DC4 /* Yoga.c in Sources */,
1868-
3D3CD9071DE5FBD600167DC4 /* YGNodeList.c in Sources */,
1861+
3D80D9191DF6F7CF0028D040 /* JSCWrapper.cpp in Sources */,
18691862
);
18701863
runOnlyForDeploymentPostprocessing = 0;
18711864
};
18721865
3D3CD9121DE5FBD800167DC4 /* Sources */ = {
18731866
isa = PBXSourcesBuildPhase;
18741867
buildActionMask = 2147483647;
18751868
files = (
1876-
3D3CD9131DE5FBD800167DC4 /* Yoga.c in Sources */,
1877-
3D3CD9141DE5FBD800167DC4 /* YGNodeList.c in Sources */,
1869+
3D80D91A1DF6F7CF0028D040 /* JSCWrapper.cpp in Sources */,
18781870
);
18791871
runOnlyForDeploymentPostprocessing = 0;
18801872
};
18811873
3D3CD91F1DE5FBEC00167DC4 /* Sources */ = {
18821874
isa = PBXSourcesBuildPhase;
18831875
buildActionMask = 2147483647;
18841876
files = (
1885-
3D3CD9201DE5FBEC00167DC4 /* Yoga.c in Sources */,
1886-
3D3CD9211DE5FBEC00167DC4 /* YGNodeList.c in Sources */,
1877+
3D80D9171DF6F7A80028D040 /* JSBundleType.cpp in Sources */,
18871878
);
18881879
runOnlyForDeploymentPostprocessing = 0;
18891880
};
18901881
3D3CD92C1DE5FBEE00167DC4 /* Sources */ = {
18911882
isa = PBXSourcesBuildPhase;
18921883
buildActionMask = 2147483647;
18931884
files = (
1894-
3D3CD92D1DE5FBEE00167DC4 /* Yoga.c in Sources */,
1895-
3D3CD92E1DE5FBEE00167DC4 /* YGNodeList.c in Sources */,
1885+
3D80D9181DF6F7A80028D040 /* JSBundleType.cpp in Sources */,
18961886
);
18971887
runOnlyForDeploymentPostprocessing = 0;
18981888
};
@@ -1927,7 +1917,6 @@
19271917
14F7A0F01BDA714B003C6C10 /* RCTFPSGraph.m in Sources */,
19281918
14F3620D1AABD06A001CE568 /* RCTSwitch.m in Sources */,
19291919
3D1E68DB1CABD13900DD7465 /* RCTDisplayLink.m in Sources */,
1930-
3D7A27DF1DE32541002E3F95 /* JSCWrapper.cpp in Sources */,
19311920
14F3620E1AABD06A001CE568 /* RCTSwitchManager.m in Sources */,
19321921
13B080201A69489C00A75B9A /* RCTActivityIndicatorViewManager.m in Sources */,
19331922
13E067561A70F44B002CDEE1 /* RCTViewManager.m in Sources */,
@@ -1981,7 +1970,6 @@
19811970
83A1FE8C1B62640A00BE0E65 /* RCTModalHostView.m in Sources */,
19821971
13E067551A70F44B002CDEE1 /* RCTShadowView.m in Sources */,
19831972
1450FF871BCFF28A00208362 /* RCTProfileTrampoline-arm.S in Sources */,
1984-
AC70D2ED1DE48A22002E6351 /* JSBundleType.cpp in Sources */,
19851973
131B6AF51AF1093D00FFC3E0 /* RCTSegmentedControlManager.m in Sources */,
19861974
58114A171AAE854800E7D092 /* RCTPickerManager.m in Sources */,
19871975
191E3EBE1C29D9AF00C180A6 /* RCTRefreshControlManager.m in Sources */,

0 commit comments

Comments
 (0)