Skip to content

Commit 7d97800

Browse files
cdn34ddcdn34dd
authored
Merge pull request #1054 from DataDog/carlosnogueira/fix-example-apps
[Fix] Fixes metro startup in example apps
2 parents c879432 + 0617726 commit 7d97800

File tree

7 files changed

+174
-255
lines changed

7 files changed

+174
-255
lines changed

‎benchmarks/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
"@babel/preset-env": "7.25.3",
4242
"@babel/runtime": "^7.26.10",
4343
"@datadog/datadog-ci": "3.12.0",
44-
"@react-native-community/cli": "17.0.1",
45-
"@react-native-community/cli-platform-android": "17.0.1",
46-
"@react-native-community/cli-platform-ios": "17.0.1",
44+
"@react-native-community/cli": "15.0.1",
45+
"@react-native-community/cli-platform-android": "15.0.1",
46+
"@react-native-community/cli-platform-ios": "15.0.1",
4747
"@react-native/babel-preset": "0.78.2",
4848
"@react-native/eslint-config": "0.78.2",
4949
"@react-native/metro-config": "0.78.2",

‎example-new-architecture/ios/DdSdkReactNativeExample.xcodeproj/project.pbxproj‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
1111
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
1212
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
13+
6E6EEF96505B7B7C13273254 /* libPods-DdSdkReactNativeExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D5F70B3586D3871B1E4AEC6 /* libPods-DdSdkReactNativeExample.a */; };
1314
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
1415
E05973ABEC106467505BAF84 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 91A6167299744A7A5E90FD00 /* PrivacyInfo.xcprivacy */; };
15-
F59778933728396AC9586AC3 /* libPods-DdSdkReactNativeExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F15FCB308661F5FE9CD1E2F0 /* libPods-DdSdkReactNativeExample.a */; };
1616
/* End PBXBuildFile section */
1717

1818
/* Begin PBXFileReference section */
@@ -24,20 +24,20 @@
2424
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = DdSdkReactNativeExample/Images.xcassets; sourceTree = "<group>"; };
2525
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = DdSdkReactNativeExample/Info.plist; sourceTree = "<group>"; };
2626
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = DdSdkReactNativeExample/main.m; sourceTree = "<group>"; };
27-
4A4B8157669F7C844ABF982B /* Pods-DdSdkReactNativeExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DdSdkReactNativeExample.release.xcconfig"; path = "Target Support Files/Pods-DdSdkReactNativeExample/Pods-DdSdkReactNativeExample.release.xcconfig"; sourceTree = "<group>"; };
27+
7F2E43785E4C9F07671D568A /* Pods-DdSdkReactNativeExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DdSdkReactNativeExample.debug.xcconfig"; path = "Target Support Files/Pods-DdSdkReactNativeExample/Pods-DdSdkReactNativeExample.debug.xcconfig"; sourceTree = "<group>"; };
2828
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = DdSdkReactNativeExample/LaunchScreen.storyboard; sourceTree = "<group>"; };
29+
8D5F70B3586D3871B1E4AEC6 /* libPods-DdSdkReactNativeExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-DdSdkReactNativeExample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
2930
91A6167299744A7A5E90FD00 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = DdSdkReactNativeExample/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
30-
943593C03DDD65A0F77DAD08 /* Pods-DdSdkReactNativeExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DdSdkReactNativeExample.debug.xcconfig"; path = "Target Support Files/Pods-DdSdkReactNativeExample/Pods-DdSdkReactNativeExample.debug.xcconfig"; sourceTree = "<group>"; };
31+
DA0CFD2F6619BC6603A45329 /* Pods-DdSdkReactNativeExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DdSdkReactNativeExample.release.xcconfig"; path = "Target Support Files/Pods-DdSdkReactNativeExample/Pods-DdSdkReactNativeExample.release.xcconfig"; sourceTree = "<group>"; };
3132
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
32-
F15FCB308661F5FE9CD1E2F0 /* libPods-DdSdkReactNativeExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-DdSdkReactNativeExample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
3333
/* End PBXFileReference section */
3434

3535
/* Begin PBXFrameworksBuildPhase section */
3636
13B07F8C1A680F5B00A75B9A /* Frameworks */ = {
3737
isa = PBXFrameworksBuildPhase;
3838
buildActionMask = 2147483647;
3939
files = (
40-
F59778933728396AC9586AC3 /* libPods-DdSdkReactNativeExample.a in Frameworks */,
40+
6E6EEF96505B7B7C13273254 /* libPods-DdSdkReactNativeExample.a in Frameworks */,
4141
);
4242
runOnlyForDeploymentPostprocessing = 0;
4343
};
@@ -79,7 +79,7 @@
7979
isa = PBXGroup;
8080
children = (
8181
ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
82-
F15FCB308661F5FE9CD1E2F0 /* libPods-DdSdkReactNativeExample.a */,
82+
8D5F70B3586D3871B1E4AEC6 /* libPods-DdSdkReactNativeExample.a */,
8383
);
8484
name = Frameworks;
8585
sourceTree = "<group>";
@@ -117,8 +117,8 @@
117117
BBD78D7AC51CEA395F1C20DB /* Pods */ = {
118118
isa = PBXGroup;
119119
children = (
120-
943593C03DDD65A0F77DAD08 /* Pods-DdSdkReactNativeExample.debug.xcconfig */,
121-
4A4B8157669F7C844ABF982B /* Pods-DdSdkReactNativeExample.release.xcconfig */,
120+
7F2E43785E4C9F07671D568A /* Pods-DdSdkReactNativeExample.debug.xcconfig */,
121+
DA0CFD2F6619BC6603A45329 /* Pods-DdSdkReactNativeExample.release.xcconfig */,
122122
);
123123
path = Pods;
124124
sourceTree = "<group>";
@@ -130,14 +130,14 @@
130130
isa = PBXNativeTarget;
131131
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "DdSdkReactNativeExample" */;
132132
buildPhases = (
133-
6D376D298F855F5CC23E9ED5 /* [CP] Check Pods Manifest.lock */,
133+
5291E89473F9073072159A48 /* [CP] Check Pods Manifest.lock */,
134134
FD10A7F022414F080027D42C /* Start Packager */,
135135
13B07F871A680F5B00A75B9A /* Sources */,
136136
13B07F8C1A680F5B00A75B9A /* Frameworks */,
137137
13B07F8E1A680F5B00A75B9A /* Resources */,
138138
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
139-
07743436841738907FE3FD72 /* [CP] Embed Pods Frameworks */,
140-
961EBCFFF8E0F6A3F5781446 /* [CP] Copy Pods Resources */,
139+
DA35A58E9060D5B33AC9F19B /* [CP] Embed Pods Frameworks */,
140+
A63B10F8607064B7862D32CF /* [CP] Copy Pods Resources */,
141141
);
142142
buildRules = (
143143
);
@@ -209,24 +209,7 @@
209209
shellPath = /bin/sh;
210210
shellScript = "set -e\n\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
211211
};
212-
07743436841738907FE3FD72 /* [CP] Embed Pods Frameworks */ = {
213-
isa = PBXShellScriptBuildPhase;
214-
buildActionMask = 2147483647;
215-
files = (
216-
);
217-
inputFileListPaths = (
218-
"${PODS_ROOT}/Target Support Files/Pods-DdSdkReactNativeExample/Pods-DdSdkReactNativeExample-frameworks-${CONFIGURATION}-input-files.xcfilelist",
219-
);
220-
name = "[CP] Embed Pods Frameworks";
221-
outputFileListPaths = (
222-
"${PODS_ROOT}/Target Support Files/Pods-DdSdkReactNativeExample/Pods-DdSdkReactNativeExample-frameworks-${CONFIGURATION}-output-files.xcfilelist",
223-
);
224-
runOnlyForDeploymentPostprocessing = 0;
225-
shellPath = /bin/sh;
226-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-DdSdkReactNativeExample/Pods-DdSdkReactNativeExample-frameworks.sh\"\n";
227-
showEnvVarsInLog = 0;
228-
};
229-
6D376D298F855F5CC23E9ED5 /* [CP] Check Pods Manifest.lock */ = {
212+
5291E89473F9073072159A48 /* [CP] Check Pods Manifest.lock */ = {
230213
isa = PBXShellScriptBuildPhase;
231214
buildActionMask = 2147483647;
232215
files = (
@@ -248,7 +231,7 @@
248231
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";
249232
showEnvVarsInLog = 0;
250233
};
251-
961EBCFFF8E0F6A3F5781446 /* [CP] Copy Pods Resources */ = {
234+
A63B10F8607064B7862D32CF /* [CP] Copy Pods Resources */ = {
252235
isa = PBXShellScriptBuildPhase;
253236
buildActionMask = 2147483647;
254237
files = (
@@ -265,6 +248,23 @@
265248
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-DdSdkReactNativeExample/Pods-DdSdkReactNativeExample-resources.sh\"\n";
266249
showEnvVarsInLog = 0;
267250
};
251+
DA35A58E9060D5B33AC9F19B /* [CP] Embed Pods Frameworks */ = {
252+
isa = PBXShellScriptBuildPhase;
253+
buildActionMask = 2147483647;
254+
files = (
255+
);
256+
inputFileListPaths = (
257+
"${PODS_ROOT}/Target Support Files/Pods-DdSdkReactNativeExample/Pods-DdSdkReactNativeExample-frameworks-${CONFIGURATION}-input-files.xcfilelist",
258+
);
259+
name = "[CP] Embed Pods Frameworks";
260+
outputFileListPaths = (
261+
"${PODS_ROOT}/Target Support Files/Pods-DdSdkReactNativeExample/Pods-DdSdkReactNativeExample-frameworks-${CONFIGURATION}-output-files.xcfilelist",
262+
);
263+
runOnlyForDeploymentPostprocessing = 0;
264+
shellPath = /bin/sh;
265+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-DdSdkReactNativeExample/Pods-DdSdkReactNativeExample-frameworks.sh\"\n";
266+
showEnvVarsInLog = 0;
267+
};
268268
FD10A7F022414F080027D42C /* Start Packager */ = {
269269
isa = PBXShellScriptBuildPhase;
270270
buildActionMask = 2147483647;
@@ -301,7 +301,7 @@
301301
/* Begin XCBuildConfiguration section */
302302
13B07F941A680F5B00A75B9A /* Debug */ = {
303303
isa = XCBuildConfiguration;
304-
baseConfigurationReference = 943593C03DDD65A0F77DAD08 /* Pods-DdSdkReactNativeExample.debug.xcconfig */;
304+
baseConfigurationReference = 7F2E43785E4C9F07671D568A /* Pods-DdSdkReactNativeExample.debug.xcconfig */;
305305
buildSettings = {
306306
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
307307
CLANG_ENABLE_MODULES = YES;
@@ -328,7 +328,7 @@
328328
};
329329
13B07F951A680F5B00A75B9A /* Release */ = {
330330
isa = XCBuildConfiguration;
331-
baseConfigurationReference = 4A4B8157669F7C844ABF982B /* Pods-DdSdkReactNativeExample.release.xcconfig */;
331+
baseConfigurationReference = DA0CFD2F6619BC6603A45329 /* Pods-DdSdkReactNativeExample.release.xcconfig */;
332332
buildSettings = {
333333
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
334334
CLANG_ENABLE_MODULES = YES;

‎example-new-architecture/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
"@babel/core": "^7.25.2",
1717
"@babel/preset-env": "^7.25.3",
1818
"@babel/runtime": "^7.26.10",
19-
"@react-native-community/cli": "17.0.1",
20-
"@react-native-community/cli-platform-android": "17.0.1",
21-
"@react-native-community/cli-platform-ios": "17.0.1",
19+
"@react-native-community/cli": "15.0.1",
20+
"@react-native-community/cli-platform-android": "15.0.1",
21+
"@react-native-community/cli-platform-ios": "15.0.1",
2222
"@react-native/babel-preset": "0.76.9",
2323
"@react-native/eslint-config": "0.76.9",
2424
"@react-native/metro-config": "0.76.9",

0 commit comments

Comments
 (0)