Skip to content

Commit aef0241

Browse files
SaadnajmiSaadnajmi
authored
chore(rntester): Add missing "Build JS Bundle" step to pbxproj (#2718)
## Summary: - RNTester had a build phase "Build JS Bundle", while RNTester-macOS did not. Let's just copy it over - While we're here, update the OS deployment target to match our minimum. ## Test Plan: CI should pass
1 parent 8a41f83 commit aef0241

File tree

3 files changed

+101
-80
lines changed

3 files changed

+101
-80
lines changed

‎packages/react-native/local-cli/generator-macos/templates/macos/HelloWorld.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@
352352
DEAD_CODE_STRIPPING = NO;
353353
INFOPLIST_FILE = "HelloWorld-macos/Info.plist";
354354
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
355-
MACOSX_DEPLOYMENT_TARGET = 11.0;
355+
MACOSX_DEPLOYMENT_TARGET = 14.0;
356356
OTHER_LDFLAGS = (
357357
"$(inherited)",
358358
"-ObjC",
@@ -374,7 +374,7 @@
374374
CURRENT_PROJECT_VERSION = 1;
375375
INFOPLIST_FILE = "HelloWorld-macos/Info.plist";
376376
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
377-
MACOSX_DEPLOYMENT_TARGET = 11.0;
377+
MACOSX_DEPLOYMENT_TARGET = 14.0;
378378
OTHER_LDFLAGS = (
379379
"$(inherited)",
380380
"-ObjC",

‎packages/rn-tester/Podfile.lock‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -2050,85 +2050,85 @@ EXTERNAL SOURCES:
20502050
:path: "../react-native/ReactCommon/yoga"
20512051

20522052
SPEC CHECKSUMS:
2053-
boost: 7d49a506d1ac47358fea28558d184dd6431170ca
2054-
DoubleConversion: 10f51d3e1238973c033faac2d84c0ea114942f53
2055-
fast_float: 44983b3bddb2d2ed3021a98be86f60ec8abc9ffd
2056-
FBLazyVector: 8b997d00fc3d071909c9575947c04909f52210f5
2057-
fmt: f6af2d677a106e3e44c9536a4c0c7f03ab53c854
2058-
glog: ea1690290b2b90f923ffcce07436498f09b428ee
2053+
boost: cea1d4f90a3a59537f3deb03ff5656489d7133dd
2054+
DoubleConversion: d31b1eb37f6d6f456530c4fd9124b857d6889cab
2055+
fast_float: 5596a99716f77fe44b617183d4db34777538174d
2056+
FBLazyVector: 0a3f4ff238f4a5a12df1ce799726fbae48b3219a
2057+
fmt: 24e7591456deb60b4a77518f83d9a916ac84223f
2058+
glog: 0b31c25149b9d350b2666c7d459229861a00ec07
20592059
hermes-engine: cc8feeacabc5b95002c368a555a173cddafb29c5
2060-
MyNativeView: aa3a6c9c828e708c569d8a0acbcd3a055f9acc6c
2061-
NativeCxxModuleExample: a175158ea57d40f76cf9148be33f7e6a8d56c92b
2060+
MyNativeView: 012965daf7594f221bfe8f48c3a6be88dc926ec7
2061+
NativeCxxModuleExample: d89bddc6be7c578088d4c441e1de365cca37d369
20622062
OCMock: 589f2c84dacb1f5aaf6e4cec1f292551fe748e74
2063-
OSSLibraryExample: a4b6cccbec995cd4e9abe530c4d417952c6ef898
2064-
RCT-Folly: e8b53d8c0d2d9df4a6a8b0a368a1a91fc62a88cb
2063+
OSSLibraryExample: d57a46a4520f0964e36b3ac349cb37404a469ae3
2064+
RCT-Folly: 957ce397c08be7a9a91bb9245e57e69fa5255ec5
20652065
RCTDeprecation: 3808e36294137f9ee5668f4df2e73dc079cd1dcf
2066-
RCTRequired: 0c47d5405fb6cc37656f6e864453fec3021dde59
2067-
RCTTypeSafety: af0eda6c1b092f46063ce1a4cbddf4abc9bddf85
2068-
React: ba86199397f2a5b0df620225547d8f2c4848adc9
2069-
React-callinvoker: 3c9ccf1baf084ba1743b7b09ab185b6de2de28c7
2070-
React-Core: 2180633724a0d72f378b381da4ac9974d8cb475b
2071-
React-CoreModules: 1d07c34560a2210fa39b7272a2fa4a7eaf3ffa56
2072-
React-cxxreact: 501d96ff67c1572a8b2eb3165b338f0376418044
2073-
React-debug: 0c133ac0203f7d367cd81ce43abc3913491a04ba
2074-
React-defaultsnativemodule: 9b94c1369cda69965bc7eaa220d3c097376576bd
2075-
React-domnativemodule: 4a4bcea1741e5deb5f8766e2161800012aeadb0c
2076-
React-Fabric: c2e3cebfe632f14c0d4d2fee2e1ddfd62c85d307
2077-
React-FabricComponents: 41541b3542f437413d683889c70912d3d60dd039
2078-
React-FabricImage: a73d131a8a0fb568ae2f79e46038ae2417f15f4b
2079-
React-featureflags: b48646b4cf3d8c2978b007921a87b978044f974d
2080-
React-featureflagsnativemodule: 47c63d00d4c75347de95dffc6c4963511934a677
2081-
React-graphics: d33e8b362ed4e87894846325073f983de74eebf6
2082-
React-hermes: 566e99e43347afc7a8105b74a72e2d5380094492
2083-
React-idlecallbacksnativemodule: a4ae26f4db3a05a79bfdf3415582353bfca3b93b
2084-
React-ImageManager: 200d10c97e27fc23b6a41b65268f905a176c7536
2085-
React-jserrorhandler: f5bfbf0be18a4e3a51c7187103be16a063068e70
2086-
React-jsi: 44d71eb6a0ec638a859d32f7d9dbdb739fcfdbef
2087-
React-jsiexecutor: 330c1f33c0add93bcae811618ba400fceff57fff
2088-
React-jsinspector: 6824abedd9ac2a4a8635da06dd0fead2e0c05dc9
2089-
React-jsinspectortracing: be99d4b4554fc9d0663f6c8c59ed2d2afd98cd22
2090-
React-jsitooling: 4afc51b6f49007014817174fa75a795dea6d6ccc
2091-
React-jsitracing: 3f0d7c2b0393e0d55905ebc00b01d4e8f7c67df0
2092-
React-logger: 5982237a563f24221e754bc1a16b82d0b453982e
2093-
React-Mapbuffer: 6e267509e77bbd967b3de25e77cabf9d99892c78
2094-
React-microtasksnativemodule: bfa97e08d952b7193f292b9a92cc53b118047b6e
2095-
React-NativeModulesApple: 23f4f84f835e02c0ddb44aa69b67dc7d85506102
2096-
React-oscompat: 146be08ce4d8fae18559f3225df03b053929eb0f
2097-
React-perflogger: 13183ba695b730b74e3877529e21f98578338525
2098-
React-performancetimeline: 6a97fd804d25a73bc314e0bb34977e5e60b9cfd4
2099-
React-RCTActionSheet: 5049ad51779bb4e2e79e50fb570d3c70bba93047
2100-
React-RCTAnimation: 971cda9d28f90f7fcd1d8900c023305852f4a6a3
2101-
React-RCTAppDelegate: 223226fcd4e3511f45da3f6a517dd4bd691b8b07
2102-
React-RCTBlob: f625f88a1450a00238e567b4242c81f49e3f4b42
2103-
React-RCTFabric: 41334059320c9b2f9de48c652c91b8e22334c9ad
2104-
React-RCTFBReactNativeSpec: 4e91cbb59dc2b1dd236b8dbcddfcc6251607e775
2105-
React-RCTImage: e1f544514a6fd48ba4ee3919a167eec762b1c55e
2106-
React-RCTLinking: a84d2eb6c9c5e59d888814d2fdde47603952469b
2107-
React-RCTNetwork: 1efff9cce43b1820b108dfac911e6ccc24eb482e
2108-
React-RCTPushNotification: 1c85400418a17b4ffb894397afe2a3a8bd44be8f
2109-
React-RCTRuntime: 49513ac9eb54f49bb5fd240138f5d6613c882acd
2110-
React-RCTSettings: a7ba056db083cb922600adab70501f38bc871f17
2111-
React-RCTTest: b8b8a3e13aded39458727ca9674503ff11725c53
2112-
React-RCTText: dc8aa2f759d2ca1608fd9293e0f312dc4bdc994e
2113-
React-RCTVibration: f9c9eca13901ab85c309fdda4e00a24f2bab05f2
2114-
React-rendererconsistency: 5d2e9b876360402c868078c20879997d269de2a6
2115-
React-renderercss: 830ac479c4bf7e7dd4597ccbf399a4db00c18db6
2116-
React-rendererdebug: 37d499934857c1c13f5e1897fb0bfbe7b50bed5a
2117-
React-rncore: 581920e61521bb129f01e74346fd514aa7ba443b
2118-
React-RuntimeApple: bc661a9fbe43b48e460d05546cc858a35e654da0
2119-
React-RuntimeCore: 063e37ade6e5b34081032eaf54de5aeb28ef1783
2120-
React-runtimeexecutor: 14cbffe176692244c668f582fd8c4cbbbef60e14
2121-
React-RuntimeHermes: 8b3c64db9d34f500517ad7a71ea61453fe9793e3
2122-
React-runtimescheduler: e9a700bc01d3541237f72cba3fead72c7fd782ba
2123-
React-timing: 6174fcd2a3faf06110154dc2187ac94b30642b49
2124-
React-utils: 11782373c314043cfd2540703be63b8482885af3
2125-
ReactAppDependencyProvider: ca5c4eb34176d78acaba089616f8ac5a49f4d0a8
2126-
ReactCodegen: df0f0b5c14998a8856741935e0b94307941200e4
2127-
ReactCommon: cf307e9d1f47759f3829f381d2f8b2fccaece268
2128-
ReactCommon-Samples: 23861ee5296d526734a722267e6761be7fe8139a
2129-
ScreenshotManager: b65ac842cefba12868b0a1552fed48e618ca35b0
2130-
SocketRocket: 03f7111df1a343b162bf5b06ead333be808e1e0a
2131-
Yoga: 22172c124e16a9c9de1d3169f9a55fd58c1c9142
2066+
RCTRequired: 5c10a42787b18fabbacda1669d333270f78dfed1
2067+
RCTTypeSafety: 04629d6e8ee80c4ddb1bc2acb80b1ca88de284c9
2068+
React: ee7f072e1e2db3fd4da25483b3cb6868964aa7ed
2069+
React-callinvoker: 94acfd04af532e289b9e992fad6f71b0a1fb752f
2070+
React-Core: 7b58428f7a2c1a685713e3e14387a8f98da88e03
2071+
React-CoreModules: 5f97a14ece13839935df5ae9456db172f966c1f4
2072+
React-cxxreact: d152f08b17a34ae1ec345029cdc24919828bda88
2073+
React-debug: bd53bf62a49fe5858a569204c3df64dc0a3c0e6a
2074+
React-defaultsnativemodule: a59c04097aff0751a08745ef6aaa217ab1178be7
2075+
React-domnativemodule: 403a11dd566425a55d3bf58a13127a2c12c2afc7
2076+
React-Fabric: 0c8a6ce4745ccdc43aec6a664e496218d8bdfc33
2077+
React-FabricComponents: 4af2a2865dc407f5c2e75faa2734ba389461e4b4
2078+
React-FabricImage: 7ca716a0ed4dcf506fcdcd60986501c527cfcc6e
2079+
React-featureflags: 8a8f76aa906abe8a561c2e81569d159509a7b244
2080+
React-featureflagsnativemodule: f9330ce11a0cb7e1b51e30cc261add31294d93c2
2081+
React-graphics: aa9108bb694c9ddb04eb0cd8b9bd7c0c09de83a2
2082+
React-hermes: a10ae5b0156d75c05f4c737336cb593b2b27a2df
2083+
React-idlecallbacksnativemodule: c9fe93ba4f421319ad4bcd0d7131e0d3c510cbfb
2084+
React-ImageManager: cfbe01dd1d75ed9aa33c09c66e3e3f20970f4981
2085+
React-jserrorhandler: 099f5a111a9117e5cb7be4a31a151e2977ec20ef
2086+
React-jsi: f06232f271ddafb13d90bfecda92a84d29bb0d36
2087+
React-jsiexecutor: 445b0458ddf8920c995d96af05bc8d66b7fc138a
2088+
React-jsinspector: af8da9536a4e2402d65c47e01a64118628f067b4
2089+
React-jsinspectortracing: eef865f1f8db567faac91bb857a880f7eab7e2d0
2090+
React-jsitooling: 397f96aed700fd416ff6fe16ed88f4fa45c64ba2
2091+
React-jsitracing: b149f1f31dda23f0ba72151b0024964a76741fa7
2092+
React-logger: 51cdb2d4cb36b78f9f154dda2fdb1e7dba204765
2093+
React-Mapbuffer: bb17a086220da31233ca695abe63ca01dec40d82
2094+
React-microtasksnativemodule: ac413e56d6d81b77b9a1aae7ff1aad8afb6050c5
2095+
React-NativeModulesApple: db1a001d34e7f0e8b25dfefa2a2ce83b6a6442d9
2096+
React-oscompat: 825c3b67ca607307fc7493101bee3ec6c18b2ca7
2097+
React-perflogger: ad75d71af0ddce6ea06d6d47eae3151563a01b55
2098+
React-performancetimeline: 53df2b097c87eab5bb14ed00cab95be9f82e2f64
2099+
React-RCTActionSheet: a9fc70ec6783733305602ffb0cb9ab956221230e
2100+
React-RCTAnimation: cc7bff4261b79f6fbb2df431bf6c312690f6c40c
2101+
React-RCTAppDelegate: bd84d753358c4103b81d6fe33c1e64c844615516
2102+
React-RCTBlob: 80c0a82e1b20f05416636841f0f13cbe28c6df6d
2103+
React-RCTFabric: dd0221952b4cfafbe1d548e59272a48f5d7b233a
2104+
React-RCTFBReactNativeSpec: c3b76c04af6b9842ce62db58c670a756a45bdee1
2105+
React-RCTImage: f810320175a60490085043f6aa65f4e91c4fd42d
2106+
React-RCTLinking: 1a4ed8deb97f91b641bbe31c223a80d3bfa040b2
2107+
React-RCTNetwork: bd30579e9d1b20708525428d6f1a44c1adfdcf5f
2108+
React-RCTPushNotification: 85664072a6ed949dbc244440a60be24f201eee2b
2109+
React-RCTRuntime: e7a1a5d3c48065d96e351f20b521c3e1e01cd55f
2110+
React-RCTSettings: 65a4df3015d7fd9c6efc455f0df9de8a48001b88
2111+
React-RCTTest: 0ee2333eb05005b100ce25749e3b3dfca40908f7
2112+
React-RCTText: d633a9c03fca2a1a228a0ede5e340169bb851618
2113+
React-RCTVibration: 0deb664da65c4302963a8c2d6f23995059341fea
2114+
React-rendererconsistency: 00316a8639306ac717d62d2874b885088cde31d4
2115+
React-renderercss: f11c56e70856232f2d34ab96df245a674a2ba769
2116+
React-rendererdebug: 12d895f5fae069c25aa0c33a138ddd3f308fd8f2
2117+
React-rncore: a0871316bff44288ba62c1374b6e9093717dbc89
2118+
React-RuntimeApple: 29d74569f8f83a2e98b73a532d063250a5170347
2119+
React-RuntimeCore: 54235f3ab77822160c01fa7ab543f3ea512e56e6
2120+
React-runtimeexecutor: a3ea35a56f73642ff5c888869e3e5eecd842f8c9
2121+
React-RuntimeHermes: 9f0c0fd0b045d2ee552ad96044be15e76a1b7485
2122+
React-runtimescheduler: 5d60a6ef3abdba3b0f688eacd3a106a45f09c334
2123+
React-timing: ba0ea02d49e288be015576fc217184a521f3508d
2124+
React-utils: 3101cddb3c50406b3949fe36e8fad34609dd561c
2125+
ReactAppDependencyProvider: 4d000089a4f20b7df5b5849581808301af186297
2126+
ReactCodegen: 0082198e27eef7ce13bf03680eb9d15bbde56601
2127+
ReactCommon: ccca86fc30847bda1f64f6d8f84a596a4ce02f26
2128+
ReactCommon-Samples: feac96a466176d8aa790a5ae4e6076d66f437ffc
2129+
ScreenshotManager: c96f07e207c96f5d91080e408aff95df63875dae
2130+
SocketRocket: a1845ec01e17d55e3da5df40600892972afb45e1
2131+
Yoga: 1cff0cfbf14d209e21b2f3b023de56f24b43b6fd
21322132

21332133
PODFILE CHECKSUM: 07eddbe098f0e50aff590a91207f692788a9fe4c
21342134

‎packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,7 @@
603603
ACC52F3C299ECB7A002A2B0B /* Resources */,
604604
3106AC984814CBD2BBC7D019 /* [CP] Copy Pods Resources */,
605605
308A85FD8F443CC8EF54D564 /* [CP] Embed Pods Frameworks */,
606+
AC7A72122E947C790068C621 /* Build JS Bundle */,
606607
);
607608
buildRules = (
608609
);
@@ -1104,6 +1105,26 @@
11041105
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
11051106
showEnvVarsInLog = 0;
11061107
};
1108+
AC7A72122E947C790068C621 /* Build JS Bundle */ = {
1109+
isa = PBXShellScriptBuildPhase;
1110+
buildActionMask = 2147483647;
1111+
files = (
1112+
);
1113+
inputFileListPaths = (
1114+
);
1115+
inputPaths = (
1116+
"$(SRCROOT)/.xcode.env.local",
1117+
"$(SRCROOT)/.xcode.env",
1118+
);
1119+
name = "Build JS Bundle";
1120+
outputFileListPaths = (
1121+
);
1122+
outputPaths = (
1123+
);
1124+
runOnlyForDeploymentPostprocessing = 0;
1125+
shellPath = /bin/sh;
1126+
shellScript = "set -e\n\nexport PROJECT_ROOT=\"$SRCROOT\"\nexport ENTRY_FILE=\"$SRCROOT/js/RNTesterApp.ios.js\"\nexport SOURCEMAP_FILE=../sourcemap.ios.map\n# export FORCE_BUNDLING=true \n\nWITH_ENVIRONMENT=\"../react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
1127+
};
11071128
B32E91D3B40C704888C73008 /* [CP] Copy Pods Resources */ = {
11081129
isa = PBXShellScriptBuildPhase;
11091130
buildActionMask = 2147483647;
@@ -1785,7 +1806,7 @@
17851806
"$(inherited)",
17861807
"@executable_path/../Frameworks",
17871808
);
1788-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1809+
MACOSX_DEPLOYMENT_TARGET = 14.6;
17891810
MARKETING_VERSION = 1.0;
17901811
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
17911812
MTL_FAST_MATH = YES;
@@ -1827,7 +1848,7 @@
18271848
"$(inherited)",
18281849
"@executable_path/../Frameworks",
18291850
);
1830-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1851+
MACOSX_DEPLOYMENT_TARGET = 14.6;
18311852
MARKETING_VERSION = 1.0;
18321853
MTL_FAST_MATH = YES;
18331854
PRODUCT_BUNDLE_IDENTIFIER = "Microsoft.RNTester-macOS";

0 commit comments

Comments
 (0)