Skip to content

Commit 092d677

Browse files
JakubGoneraJakubGonera
committed
fix: move third-party and fix ET static libs paths
1 parent f7fcf64 commit 092d677

File tree

569 files changed

+793
-801
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

569 files changed

+793
-801
lines changed

‎apps/computer-vision/ios/Podfile.lock‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ PODS:
7070
- hermes-engine (0.79.2):
7171
- hermes-engine/Pre-built (= 0.79.2)
7272
- hermes-engine/Pre-built (0.79.2)
73-
- opencv-rne (0.1.0)
73+
- opencv-rne (4.11.0)
7474
- RCT-Folly (2024.11.18.00):
7575
- boost
7676
- DoubleConversion
@@ -1395,11 +1395,11 @@ PODS:
13951395
- React-jsiexecutor
13961396
- React-RCTFBReactNativeSpec
13971397
- ReactCommon/turbomodule/core
1398-
- react-native-executorch (0.4.2):
1398+
- react-native-executorch (20250527131314):
13991399
- DoubleConversion
14001400
- glog
14011401
- hermes-engine
1402-
- opencv-rne (~> 0.1.0)
1402+
- opencv-rne (~> 4.11.0)
14031403
- RCT-Folly (= 2024.11.18.00)
14041404
- RCTRequired
14051405
- RCTTypeSafety
@@ -1419,6 +1419,7 @@ PODS:
14191419
- ReactCodegen
14201420
- ReactCommon/turbomodule/bridging
14211421
- ReactCommon/turbomodule/core
1422+
- sqlite3
14221423
- Yoga
14231424
- react-native-image-picker (7.2.3):
14241425
- DoubleConversion
@@ -2041,6 +2042,9 @@ PODS:
20412042
- ReactCommon/turbomodule/core
20422043
- Yoga
20432044
- SocketRocket (0.7.1)
2045+
- sqlite3 (3.49.2):
2046+
- sqlite3/common (= 3.49.2)
2047+
- sqlite3/common (3.49.2)
20442048
- Yoga (0.0.0)
20452049

20462050
DEPENDENCIES:
@@ -2134,6 +2138,7 @@ SPEC REPOS:
21342138
trunk:
21352139
- opencv-rne
21362140
- SocketRocket
2141+
- sqlite3
21372142

21382143
EXTERNAL SOURCES:
21392144
boost:
@@ -2319,7 +2324,7 @@ SPEC CHECKSUMS:
23192324
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
23202325
glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
23212326
hermes-engine: 314be5250afa5692b57b4dd1705959e1973a8ebe
2322-
opencv-rne: 63e933ae2373fc91351f9a348dc46c3f523c2d3f
2327+
opencv-rne: 2305807573b6e29c8c87e3416ab096d09047a7a0
23232328
RCT-Folly: e78785aa9ba2ed998ea4151e314036f6c49e6d82
23242329
RCTDeprecation: 83ffb90c23ee5cea353bd32008a7bca100908f8c
23252330
RCTRequired: eb7c0aba998009f47a540bec9e9d69a54f68136e
@@ -2351,7 +2356,7 @@ SPEC CHECKSUMS:
23512356
React-logger: 8edfcedc100544791cd82692ca5a574240a16219
23522357
React-Mapbuffer: c3f4b608e4a59dd2f6a416ef4d47a14400194468
23532358
React-microtasksnativemodule: 054f34e9b82f02bd40f09cebd4083828b5b2beb6
2354-
react-native-executorch: 6939375a7c6c4095724675cfd86a7f9c2efdbaa2
2359+
react-native-executorch: 4abc1da8235ba6c77f5ebe592b4d7e8724312adf
23552360
react-native-image-picker: 8a3f16000e794f5381a7fe47bb48fd8d06741e47
23562361
react-native-safe-area-context: 562163222d999b79a51577eda2ea8ad2c32b4d06
23572362
react-native-skia: b6cb66e99a953dae6880348c92cfb20a76d90b4f
@@ -2389,6 +2394,7 @@ SPEC CHECKSUMS:
23892394
RNReanimated: afd6a269a47d6f13ba295c46c6c0e14e3cbd0d8a
23902395
RNSVG: 794f269526df9ddc1f79b3d1a202b619df0368e3
23912396
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
2397+
sqlite3: 3c950dc86011117c307eb0b28c4a7bb449dce9f1
23922398
Yoga: c758bfb934100bb4bf9cbaccb52557cee35e8bdf
23932399

23942400
PODFILE CHECKSUM: 12be54799a0524303b792fe9e93fedb70ce87ef7

‎apps/computer-vision/ios/computervision.xcodeproj/project.pbxproj‎

Lines changed: 34 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,20 @@
1010
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
1111
3193E116E537FBE8CDF1B8EB /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48E3FFF890FAD1B4A46A8D79 /* ExpoModulesProvider.swift */; };
1212
3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */; };
13+
47047DA47286F8A265F6966A /* libPods-computervision.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E029F53E28B45AAED68D8759 /* libPods-computervision.a */; };
1314
5D97C651BBAA8A827D7103BD /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 43FD47731FDB7412B8D27703 /* PrivacyInfo.xcprivacy */; };
14-
8ECE9C761F0C334C5905F3DC /* libPods-computervision.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A883A86E8ACD521325B193BA /* libPods-computervision.a */; };
15-
B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */; };
1615
BB2F792D24A3F905000567C9 /* Expo.plist in Resources */ = {isa = PBXBuildFile; fileRef = BB2F792C24A3F905000567C9 /* Expo.plist */; };
1716
F11748422D0307B40044C1D9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F11748412D0307B40044C1D9 /* AppDelegate.swift */; };
1817
/* End PBXBuildFile section */
1918

2019
/* Begin PBXFileReference section */
21-
00D3ACA31040E8F7A3BA0935 /* Pods-computervision.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-computervision.debug.xcconfig"; path = "Target Support Files/Pods-computervision/Pods-computervision.debug.xcconfig"; sourceTree = "<group>"; };
22-
04B98E7657007205BDD2A29A /* Pods-computervision.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-computervision.release.xcconfig"; path = "Target Support Files/Pods-computervision/Pods-computervision.release.xcconfig"; sourceTree = "<group>"; };
2320
13B07F961A680F5B00A75B9A /* computervision.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = computervision.app; sourceTree = BUILT_PRODUCTS_DIR; };
2421
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = computervision/Images.xcassets; sourceTree = "<group>"; };
2522
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = computervision/Info.plist; sourceTree = "<group>"; };
23+
43FD47731FDB7412B8D27703 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = computervision/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
2624
48E3FFF890FAD1B4A46A8D79 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-computervision/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
2725
93B288F64020F348E488903E /* Pods-computervision.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-computervision.debug.xcconfig"; path = "Target Support Files/Pods-computervision/Pods-computervision.debug.xcconfig"; sourceTree = "<group>"; };
2826
A04EBB076FD32A8D513AED00 /* Pods-computervision.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-computervision.release.xcconfig"; path = "Target Support Files/Pods-computervision/Pods-computervision.release.xcconfig"; sourceTree = "<group>"; };
29-
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = computervision/main.m; sourceTree = "<group>"; };
30-
9A2BFCDC01274C44ADBAA6A1 /* noop-file.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = "noop-file.swift"; path = "computervision/noop-file.swift"; sourceTree = "<group>"; };
31-
9F1C1E848042D20F63F5A766 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = computervision/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
32-
A883A86E8ACD521325B193BA /* libPods-computervision.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-computervision.a"; sourceTree = BUILT_PRODUCTS_DIR; };
3327
AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SplashScreen.storyboard; path = computervision/SplashScreen.storyboard; sourceTree = "<group>"; };
3428
BB2F792C24A3F905000567C9 /* Expo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Expo.plist; sourceTree = "<group>"; };
3529
E029F53E28B45AAED68D8759 /* libPods-computervision.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-computervision.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -43,7 +37,7 @@
4337
isa = PBXFrameworksBuildPhase;
4438
buildActionMask = 2147483647;
4539
files = (
46-
8ECE9C761F0C334C5905F3DC /* libPods-computervision.a in Frameworks */,
40+
47047DA47286F8A265F6966A /* libPods-computervision.a in Frameworks */,
4741
);
4842
runOnlyForDeploymentPostprocessing = 0;
4943
};
@@ -68,7 +62,7 @@
6862
isa = PBXGroup;
6963
children = (
7064
ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
71-
A883A86E8ACD521325B193BA /* libPods-computervision.a */,
65+
E029F53E28B45AAED68D8759 /* libPods-computervision.a */,
7266
);
7367
name = Frameworks;
7468
sourceTree = "<group>";
@@ -138,38 +132,21 @@
138132
path = computervision/Supporting;
139133
sourceTree = "<group>";
140134
};
141-
D65327D7A22EEC0BE12398D9 /* Pods */ = {
142-
isa = PBXGroup;
143-
children = (
144-
00D3ACA31040E8F7A3BA0935 /* Pods-computervision.debug.xcconfig */,
145-
04B98E7657007205BDD2A29A /* Pods-computervision.release.xcconfig */,
146-
);
147-
path = Pods;
148-
sourceTree = "<group>";
149-
};
150-
D7E4C46ADA2E9064B798F356 /* ExpoModulesProviders */ = {
151-
isa = PBXGroup;
152-
children = (
153-
92DBD88DE9BF7D494EA9DA96 /* computervision */,
154-
);
155-
name = ExpoModulesProviders;
156-
sourceTree = "<group>";
157-
};
158135
/* End PBXGroup section */
159136

160137
/* Begin PBXNativeTarget section */
161138
13B07F861A680F5B00A75B9A /* computervision */ = {
162139
isa = PBXNativeTarget;
163140
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "computervision" */;
164141
buildPhases = (
165-
A44E0F386BE1861A4BB0D152 /* [CP] Check Pods Manifest.lock */,
166-
40729C76425943C737B83F07 /* [Expo] Configure project */,
142+
08A4A3CD28434E44B6B9DE2E /* [CP] Check Pods Manifest.lock */,
143+
38302DF08DD520E427F27C1F /* [Expo] Configure project */,
167144
13B07F871A680F5B00A75B9A /* Sources */,
168145
13B07F8C1A680F5B00A75B9A /* Frameworks */,
169146
13B07F8E1A680F5B00A75B9A /* Resources */,
170147
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
171-
6B22C61BD8A720CC7014EB81 /* [CP] Embed Pods Frameworks */,
172-
D6A2310306AE2EE1E906EC1D /* [CP] Copy Pods Resources */,
148+
800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */,
149+
420B6DF22E64C650B34B41D6 /* [CP] Embed Pods Frameworks */,
173150
);
174151
buildRules = (
175152
);
@@ -241,68 +218,68 @@
241218
shellPath = /bin/sh;
242219
shellScript = "if [[ -f \"$PODS_ROOT/../.xcode.env\" ]]; then\n source \"$PODS_ROOT/../.xcode.env\"\nfi\nif [[ -f \"$PODS_ROOT/../.xcode.env.local\" ]]; then\n source \"$PODS_ROOT/../.xcode.env.local\"\nfi\n\n# The project root by default is one level up from the ios directory\nexport PROJECT_ROOT=\"$PROJECT_DIR\"/..\n\nif [[ \"$CONFIGURATION\" = *Debug* ]]; then\n export SKIP_BUNDLING=1\nfi\nif [[ -z \"$ENTRY_FILE\" ]]; then\n # Set the entry JS file using the bundler's entry resolution.\n export ENTRY_FILE=\"$(\"$NODE_BINARY\" -e \"require('expo/scripts/resolveAppEntry')\" \"$PROJECT_ROOT\" ios absolute | tail -n 1)\"\nfi\n\nif [[ -z \"$CLI_PATH\" ]]; then\n # Use Expo CLI\n export CLI_PATH=\"$(\"$NODE_BINARY\" --print \"require.resolve('@expo/cli', { paths: [require.resolve('expo/package.json')] })\")\"\nfi\nif [[ -z \"$BUNDLE_COMMAND\" ]]; then\n # Default Expo CLI command for bundling\n export BUNDLE_COMMAND=\"export:embed\"\nfi\n\n# Source .xcode.env.updates if it exists to allow\n# SKIP_BUNDLING to be unset if needed\nif [[ -f \"$PODS_ROOT/../.xcode.env.updates\" ]]; then\n source \"$PODS_ROOT/../.xcode.env.updates\"\nfi\n# Source local changes to allow overrides\n# if needed\nif [[ -f \"$PODS_ROOT/../.xcode.env.local\" ]]; then\n source \"$PODS_ROOT/../.xcode.env.local\"\nfi\n\n`\"$NODE_BINARY\" --print \"require('path').dirname(require.resolve('react-native/package.json')) + '/scripts/react-native-xcode.sh'\"`\n\n";
243220
};
244-
40729C76425943C737B83F07 /* [Expo] Configure project */ = {
221+
08A4A3CD28434E44B6B9DE2E /* [CP] Check Pods Manifest.lock */ = {
245222
isa = PBXShellScriptBuildPhase;
246-
alwaysOutOfDate = 1;
247223
buildActionMask = 2147483647;
248224
files = (
249225
);
250226
inputFileListPaths = (
251227
);
252228
inputPaths = (
229+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
230+
"${PODS_ROOT}/Manifest.lock",
253231
);
254-
name = "[Expo] Configure project";
232+
name = "[CP] Check Pods Manifest.lock";
255233
outputFileListPaths = (
256234
);
257235
outputPaths = (
236+
"$(DERIVED_FILE_DIR)/Pods-computervision-checkManifestLockResult.txt",
258237
);
259238
runOnlyForDeploymentPostprocessing = 0;
260239
shellPath = /bin/sh;
261-
shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-computervision/expo-configure-project.sh\"\n";
240+
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";
241+
showEnvVarsInLog = 0;
262242
};
263-
6B22C61BD8A720CC7014EB81 /* [CP] Embed Pods Frameworks */ = {
243+
38302DF08DD520E427F27C1F /* [Expo] Configure project */ = {
264244
isa = PBXShellScriptBuildPhase;
245+
alwaysOutOfDate = 1;
265246
buildActionMask = 2147483647;
266247
files = (
267248
);
249+
inputFileListPaths = (
250+
);
268251
inputPaths = (
269-
"${PODS_ROOT}/Target Support Files/Pods-computervision/Pods-computervision-frameworks.sh",
270-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
271-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/react-native-executorch/ExecutorchLib.framework/ExecutorchLib",
272252
);
273-
name = "[CP] Embed Pods Frameworks";
253+
name = "[Expo] Configure project";
254+
outputFileListPaths = (
255+
);
274256
outputPaths = (
275-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
276-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ExecutorchLib.framework",
277257
);
278258
runOnlyForDeploymentPostprocessing = 0;
279259
shellPath = /bin/sh;
280-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-computervision/Pods-computervision-frameworks.sh\"\n";
281-
showEnvVarsInLog = 0;
260+
shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-computervision/expo-configure-project.sh\"\n";
282261
};
283-
A44E0F386BE1861A4BB0D152 /* [CP] Check Pods Manifest.lock */ = {
262+
420B6DF22E64C650B34B41D6 /* [CP] Embed Pods Frameworks */ = {
284263
isa = PBXShellScriptBuildPhase;
285264
buildActionMask = 2147483647;
286265
files = (
287266
);
288-
inputFileListPaths = (
289-
);
290267
inputPaths = (
291-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
292-
"${PODS_ROOT}/Manifest.lock",
293-
);
294-
name = "[CP] Check Pods Manifest.lock";
295-
outputFileListPaths = (
268+
"${PODS_ROOT}/Target Support Files/Pods-computervision/Pods-computervision-frameworks.sh",
269+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
270+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/react-native-executorch/ExecutorchLib.framework/ExecutorchLib",
296271
);
272+
name = "[CP] Embed Pods Frameworks";
297273
outputPaths = (
298-
"$(DERIVED_FILE_DIR)/Pods-computervision-checkManifestLockResult.txt",
274+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
275+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ExecutorchLib.framework",
299276
);
300277
runOnlyForDeploymentPostprocessing = 0;
301278
shellPath = /bin/sh;
302-
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";
279+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-computervision/Pods-computervision-frameworks.sh\"\n";
303280
showEnvVarsInLog = 0;
304281
};
305-
D6A2310306AE2EE1E906EC1D /* [CP] Copy Pods Resources */ = {
282+
800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */ = {
306283
isa = PBXShellScriptBuildPhase;
307284
buildActionMask = 2147483647;
308285
files = (
@@ -355,7 +332,7 @@
355332
/* Begin XCBuildConfiguration section */
356333
13B07F941A680F5B00A75B9A /* Debug */ = {
357334
isa = XCBuildConfiguration;
358-
baseConfigurationReference = 00D3ACA31040E8F7A3BA0935 /* Pods-computervision.debug.xcconfig */;
335+
baseConfigurationReference = 93B288F64020F348E488903E /* Pods-computervision.debug.xcconfig */;
359336
buildSettings = {
360337
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
361338
CLANG_ENABLE_MODULES = YES;
@@ -391,7 +368,7 @@
391368
};
392369
13B07F951A680F5B00A75B9A /* Release */ = {
393370
isa = XCBuildConfiguration;
394-
baseConfigurationReference = 04B98E7657007205BDD2A29A /* Pods-computervision.release.xcconfig */;
371+
baseConfigurationReference = A04EBB076FD32A8D513AED00 /* Pods-computervision.release.xcconfig */;
395372
buildSettings = {
396373
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
397374
CLANG_ENABLE_MODULES = YES;

0 commit comments

Comments
 (0)