Skip to content

Commit 271649e

Browse files
committed
fix: try pod
1 parent c164af0 commit 271649e

File tree

3 files changed

+59
-60
lines changed

3 files changed

+59
-60
lines changed

.circleci/config.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ commands:
341341
command: |
342342
$ANDROID_HOME/emulator/emulator -avd test_device \
343343
-http-proxy http://localhost:8082 \
344+
-dns-server 8.8.8.8 \
344345
-writable-system \
345346
-feature -Wifi \
346347
-partition-size 2048
@@ -379,7 +380,6 @@ commands:
379380
cp ~/.mitmproxy/mitmproxy-ca-cert.pem $HASH.0
380381
adb push $HASH.0 /system/etc/security/cacerts/ && \
381382
adb shell "chmod 644 /system/etc/security/cacerts/$HASH.0"
382-
adb reboot
383383
384384
echo "Waiting for network connectivity..."
385385
for i in {1..30}; do
@@ -419,12 +419,8 @@ commands:
419419
name: Start MITM Proxy
420420
background: true
421421
command: |
422-
echo "Starting MITM Proxy on port 8082..."
423-
mitmdump -s ~/project/examples/hybrid/e2e/proxy-server.py -p 8082 --listen-host 127.0.0.1 &
422+
mitmdump -s ~/project/examples/hybrid/e2e/proxy-server.py -p 8082 &
424423
sleep 10
425-
echo "MITM Proxy started."
426-
curl -v --proxy 127.0.0.1:8082 http://mitm.it
427-
lsof -iTCP:8082 -sTCP:LISTEN
428424
- run:
429425
name: Configure and Test Proxy Settings
430426
working_directory: ~/project/examples/hybrid
@@ -905,12 +901,14 @@ jobs:
905901
TOKEN: << parameters.TOKEN >>
906902
steps:
907903
- advanced-checkout/shallow-checkout
908-
- install_node_modules
909-
- node/install-packages:
910-
pkg-manager: yarn
911-
app-dir: examples/hybrid
912-
- install_pods:
913-
working_directory: examples/hybrid/ios
904+
- install_node_modules:
905+
app-dir: << parameters.working_directory >>
906+
- build_and_pack_sdk:
907+
working_directory: << parameters.working_directory >>
908+
- run:
909+
name: Install CocoaPods
910+
working_directory: <<parameters.working_directory>>/ios
911+
command: pod install
914912
- run:
915913
name: Build iOS App
916914
working_directory: <<parameters.working_directory>>/ios

examples/hybrid/ios/HybridSampleApp.xcodeproj/project.pbxproj

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
0CFE4DEF2CC818D50003EEA7 /* HybridSampleAppUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CFE4DEE2CC818D50003EEA7 /* HybridSampleAppUITests.m */; };
1919
0CFE4DF12CC818D50003EEA7 /* HybridSampleAppUITestsLaunchTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CFE4DF02CC818D50003EEA7 /* HybridSampleAppUITestsLaunchTests.m */; };
2020
0CFE4DFE2CC81A4D0003EEA7 /* Instabug.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CFE4DFD2CC81A4D0003EEA7 /* Instabug.xcframework */; };
21-
FCBC22B3A9C75BA1AAF480E1 /* libPods-HybridSampleApp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14C2454FFB8A5023AED721D7 /* libPods-HybridSampleApp.a */; };
21+
E44B288927A73462E0C10EE7 /* libPods-HybridSampleApp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A1AEE5B6BC6AB27692839E73 /* libPods-HybridSampleApp.a */; };
2222
/* End PBXBuildFile section */
2323

2424
/* Begin PBXContainerItemProxy section */
@@ -39,7 +39,6 @@
3939
/* End PBXContainerItemProxy section */
4040

4141
/* Begin PBXFileReference section */
42-
021B14A90620D99B9917EC1C /* Pods-HybridSampleApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HybridSampleApp.release.xcconfig"; path = "Target Support Files/Pods-HybridSampleApp/Pods-HybridSampleApp.release.xcconfig"; sourceTree = "<group>"; };
4342
0CFE4DC52CC818D30003EEA7 /* HybridSampleApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HybridSampleApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
4443
0CFE4DC82CC818D30003EEA7 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
4544
0CFE4DC92CC818D30003EEA7 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -58,8 +57,9 @@
5857
0CFE4DEE2CC818D50003EEA7 /* HybridSampleAppUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HybridSampleAppUITests.m; sourceTree = "<group>"; };
5958
0CFE4DF02CC818D50003EEA7 /* HybridSampleAppUITestsLaunchTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HybridSampleAppUITestsLaunchTests.m; sourceTree = "<group>"; };
6059
0CFE4DFD2CC81A4D0003EEA7 /* Instabug.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Instabug.xcframework; path = Pods/Instabug/Instabug.xcframework; sourceTree = "<group>"; };
61-
14C2454FFB8A5023AED721D7 /* libPods-HybridSampleApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-HybridSampleApp.a"; sourceTree = BUILT_PRODUCTS_DIR; };
62-
186E35683F28099437AF6CB1 /* Pods-HybridSampleApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HybridSampleApp.debug.xcconfig"; path = "Target Support Files/Pods-HybridSampleApp/Pods-HybridSampleApp.debug.xcconfig"; sourceTree = "<group>"; };
60+
757F0F1B337DDAA4BB313C20 /* Pods-HybridSampleApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HybridSampleApp.debug.xcconfig"; path = "Target Support Files/Pods-HybridSampleApp/Pods-HybridSampleApp.debug.xcconfig"; sourceTree = "<group>"; };
61+
A1AEE5B6BC6AB27692839E73 /* libPods-HybridSampleApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-HybridSampleApp.a"; sourceTree = BUILT_PRODUCTS_DIR; };
62+
B69F4A0DCC5DED4E42E99249 /* Pods-HybridSampleApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HybridSampleApp.release.xcconfig"; path = "Target Support Files/Pods-HybridSampleApp/Pods-HybridSampleApp.release.xcconfig"; sourceTree = "<group>"; };
6363
/* End PBXFileReference section */
6464

6565
/* Begin PBXFrameworksBuildPhase section */
@@ -68,7 +68,7 @@
6868
buildActionMask = 2147483647;
6969
files = (
7070
0CFE4DFE2CC81A4D0003EEA7 /* Instabug.xcframework in Frameworks */,
71-
FCBC22B3A9C75BA1AAF480E1 /* libPods-HybridSampleApp.a in Frameworks */,
71+
E44B288927A73462E0C10EE7 /* libPods-HybridSampleApp.a in Frameworks */,
7272
);
7373
runOnlyForDeploymentPostprocessing = 0;
7474
};
@@ -149,8 +149,8 @@
149149
2DDC8407773CA2FAF348AF0C /* Pods */ = {
150150
isa = PBXGroup;
151151
children = (
152-
186E35683F28099437AF6CB1 /* Pods-HybridSampleApp.debug.xcconfig */,
153-
021B14A90620D99B9917EC1C /* Pods-HybridSampleApp.release.xcconfig */,
152+
757F0F1B337DDAA4BB313C20 /* Pods-HybridSampleApp.debug.xcconfig */,
153+
B69F4A0DCC5DED4E42E99249 /* Pods-HybridSampleApp.release.xcconfig */,
154154
);
155155
path = Pods;
156156
sourceTree = "<group>";
@@ -159,7 +159,7 @@
159159
isa = PBXGroup;
160160
children = (
161161
0CFE4DFD2CC81A4D0003EEA7 /* Instabug.xcframework */,
162-
14C2454FFB8A5023AED721D7 /* libPods-HybridSampleApp.a */,
162+
A1AEE5B6BC6AB27692839E73 /* libPods-HybridSampleApp.a */,
163163
);
164164
name = Frameworks;
165165
sourceTree = "<group>";
@@ -171,15 +171,15 @@
171171
isa = PBXNativeTarget;
172172
buildConfigurationList = 0CFE4DF42CC818D50003EEA7 /* Build configuration list for PBXNativeTarget "HybridSampleApp" */;
173173
buildPhases = (
174-
887C85FF77114EE53BBBEA59 /* [CP] Check Pods Manifest.lock */,
174+
0136367538BE9097244A4D38 /* [CP] Check Pods Manifest.lock */,
175175
0CFE4DC12CC818D30003EEA7 /* Sources */,
176176
0CFE4DC22CC818D30003EEA7 /* Frameworks */,
177177
0CFE4DC32CC818D30003EEA7 /* Resources */,
178178
0C3BA78F2CD3CC490012085A /* start */,
179179
0C3BA7902CD3CD1D0012085A /* Bundle React Native code and images */,
180-
43E9D8C4501A4EA56A4DD1A7 /* [CP] Embed Pods Frameworks */,
181-
3D02E3227CE8C673228EF5BC /* [CP] Copy Pods Resources */,
182-
4427C0BFC4EB64590F890DF4 /* [CP-User] [instabug-reactnative] Upload Sourcemap */,
180+
F64C6BD92EBE0B86387624CF /* [CP] Embed Pods Frameworks */,
181+
21F44628D01A33EA8AC64220 /* [CP] Copy Pods Resources */,
182+
011475AEE586BD5251055A91 /* [CP-User] [instabug-reactnative] Upload Sourcemap */,
183183
);
184184
buildRules = (
185185
);
@@ -296,6 +296,38 @@
296296
/* End PBXResourcesBuildPhase section */
297297

298298
/* Begin PBXShellScriptBuildPhase section */
299+
011475AEE586BD5251055A91 /* [CP-User] [instabug-reactnative] Upload Sourcemap */ = {
300+
isa = PBXShellScriptBuildPhase;
301+
buildActionMask = 2147483647;
302+
files = (
303+
);
304+
name = "[CP-User] [instabug-reactnative] Upload Sourcemap";
305+
runOnlyForDeploymentPostprocessing = 0;
306+
shellPath = /bin/sh;
307+
shellScript = "#!/bin/sh\n\nmain() {\n # Read environment variables from ios/.xcode.env if it exists\n env_path=\"$PODS_ROOT/../.xcode.env\"\n if [ -f \"$env_path\" ]; then\n source \"$env_path\"\n fi\n\n # Read environment variables from ios/.xcode.env.local if it exists\n local_env_path=\"${ENV_PATH}.local\"\n if [ -f \"$local_env_path\" ]; then\n source \"$local_env_path\"\n fi\n\n if [[ \"$INSTABUG_SOURCEMAPS_UPLOAD_DISABLE\" = true ]]; then\n echo \"[Info] \\`INSTABUG_SOURCEMAPS_UPLOAD_DISABLE\\` was set to true, skipping sourcemaps upload...\"\n exit 0\n fi\n\n if [[ \"$CONFIGURATION\" = \"Debug\" ]]; then\n echo \"[Info] Building in debug mode, skipping sourcemaps upload...\"\n exit 0\n fi\n\n if [[ -z \"$INFOPLIST_FILE\" ]] || [[ -z \"$PROJECT_DIR\" ]]; then\n echo \"[Error] Instabug sourcemaps script must be invoked by Xcode\"\n exit 0\n fi\n\n local source_map_file=$(generate_sourcemaps | tail -n 1)\n\n local js_project_dir=\"$PROJECT_DIR/..\"\n local instabug_dir=$(dirname $(node -p \"require.resolve('instabug-reactnative/package.json')\"))\n local inferred_token=$(cd $js_project_dir && source $instabug_dir/scripts/find-token.sh)\n local app_token=$(resolve_var \"App Token\" \"INSTABUG_APP_TOKEN\" \"$inferred_token\" | tail -n 1)\n\n local inferred_name=$(/usr/libexec/PlistBuddy -c 'print CFBundleShortVersionString' \"$PROJECT_DIR/$INFOPLIST_FILE\")\n local version_name=$(resolve_var \"Version Name\" \"INSTABUG_APP_VERSION_NAME\" \"$inferred_name\" | tail -n 1)\n\n local inferred_code=$(/usr/libexec/PlistBuddy -c 'print CFBundleVersion' \"$PROJECT_DIR/$INFOPLIST_FILE\")\n local version_code=$(resolve_var \"Version Code\" \"INSTABUG_APP_VERSION_CODE\" \"$inferred_code\" | tail -n 1)\n\n node $instabug_dir/bin/index.js upload-sourcemaps \\\n --platform ios \\\n --file $source_map_file \\\n --token $app_token \\\n --name $version_name \\\n --code $version_code\n}\n\ngenerate_sourcemaps() {\n local react_native_dir=$(dirname $(node -p \"require.resolve('react-native/package.json')\"))\n\n # Fixes an issue with react-native prior to v0.67.0\n # For more info: https://github.com/facebook/react-native/issues/32168\n export RN_DIR=$react_native_dir\n\n # Used withing `react-native-xcode.sh` to generate sourcemap file\n export SOURCEMAP_FILE=\"$(pwd)/main.jsbundle.map\";\n\n source \"$react_native_dir/scripts/react-native-xcode.sh\"\n\n if [[ ! -f \"$SOURCEMAP_FILE\" ]]; then\n echo \"[Error] Unable to find source map file at: $SOURCEMAP_FILE\"\n exit 0\n fi\n\n echo $SOURCEMAP_FILE\n}\n\nresolve_var() {\n local name=$1\n local env_key=$2\n local default_value=$3\n\n local env_value=\"${!env_key}\"\n\n if [[ -n \"$env_value\" ]] && [[ -n \"$default_value\" ]] && [[ \"$env_value\" != default_value ]]; then\n echo \"[Warning] Environment variable \\`$env_key\\` might have incorrect value, make sure this was intentional:\"\n echo \" Environment Value: $env_value\"\n echo \" Default Value: $default_value\"\n fi\n\n local value=\"${env_value:-$default_value}\"\n\n if [[ -z \"$value\" ]]; then\n echo \"[Error] Unable to find $name! Set the environment variable \\`$env_key\\` and try again.\"\n exit 0\n fi\n\n echo $value\n}\n\nmain \"$@\"; exit\n";
308+
};
309+
0136367538BE9097244A4D38 /* [CP] Check Pods Manifest.lock */ = {
310+
isa = PBXShellScriptBuildPhase;
311+
buildActionMask = 2147483647;
312+
files = (
313+
);
314+
inputFileListPaths = (
315+
);
316+
inputPaths = (
317+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
318+
"${PODS_ROOT}/Manifest.lock",
319+
);
320+
name = "[CP] Check Pods Manifest.lock";
321+
outputFileListPaths = (
322+
);
323+
outputPaths = (
324+
"$(DERIVED_FILE_DIR)/Pods-HybridSampleApp-checkManifestLockResult.txt",
325+
);
326+
runOnlyForDeploymentPostprocessing = 0;
327+
shellPath = /bin/sh;
328+
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";
329+
showEnvVarsInLog = 0;
330+
};
299331
0C3BA78F2CD3CC490012085A /* start */ = {
300332
isa = PBXShellScriptBuildPhase;
301333
buildActionMask = 2147483647;
@@ -335,7 +367,7 @@
335367
shellPath = /bin/sh;
336368
shellScript = "# Type a script or drag a script file from your workspace\nexport NODE_BINARY=node\nexport ENTRY_FILE=\"index.js\"\n\n# This is the path to your project's root, where \"package.json\" lives\nexport PROJECT_ROOT=\"$PROJECT_DIR/..\"\n\nWITH_ENVIRONMENT=\"${PROJECT_ROOT}/node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"${PROJECT_ROOT}/node_modules/react-native/scripts/react-native-xcode.sh\"\n\nif [[ -f \"$WITH_ENVIRONMENT\" ]]; then\n /bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\nelse\n echo \"error: File $WITH_ENVIRONMENT does not exist. Are you sure React Native is installed in your project?\"\n exit 1\nfi\n";
337369
};
338-
3D02E3227CE8C673228EF5BC /* [CP] Copy Pods Resources */ = {
370+
21F44628D01A33EA8AC64220 /* [CP] Copy Pods Resources */ = {
339371
isa = PBXShellScriptBuildPhase;
340372
buildActionMask = 2147483647;
341373
files = (
@@ -352,7 +384,7 @@
352384
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-HybridSampleApp/Pods-HybridSampleApp-resources.sh\"\n";
353385
showEnvVarsInLog = 0;
354386
};
355-
43E9D8C4501A4EA56A4DD1A7 /* [CP] Embed Pods Frameworks */ = {
387+
F64C6BD92EBE0B86387624CF /* [CP] Embed Pods Frameworks */ = {
356388
isa = PBXShellScriptBuildPhase;
357389
buildActionMask = 2147483647;
358390
files = (
@@ -369,38 +401,6 @@
369401
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-HybridSampleApp/Pods-HybridSampleApp-frameworks.sh\"\n";
370402
showEnvVarsInLog = 0;
371403
};
372-
4427C0BFC4EB64590F890DF4 /* [CP-User] [instabug-reactnative] Upload Sourcemap */ = {
373-
isa = PBXShellScriptBuildPhase;
374-
buildActionMask = 2147483647;
375-
files = (
376-
);
377-
name = "[CP-User] [instabug-reactnative] Upload Sourcemap";
378-
runOnlyForDeploymentPostprocessing = 0;
379-
shellPath = /bin/sh;
380-
shellScript = "#!/bin/sh\n\nmain() {\n # Read environment variables from ios/.xcode.env if it exists\n env_path=\"$PODS_ROOT/../.xcode.env\"\n if [ -f \"$env_path\" ]; then\n source \"$env_path\"\n fi\n\n # Read environment variables from ios/.xcode.env.local if it exists\n local_env_path=\"${ENV_PATH}.local\"\n if [ -f \"$local_env_path\" ]; then\n source \"$local_env_path\"\n fi\n\n if [[ \"$INSTABUG_SOURCEMAPS_UPLOAD_DISABLE\" = true ]]; then\n echo \"[Info] \\`INSTABUG_SOURCEMAPS_UPLOAD_DISABLE\\` was set to true, skipping sourcemaps upload...\"\n exit 0\n fi\n\n if [[ \"$CONFIGURATION\" = \"Debug\" ]]; then\n echo \"[Info] Building in debug mode, skipping sourcemaps upload...\"\n exit 0\n fi\n\n if [[ -z \"$INFOPLIST_FILE\" ]] || [[ -z \"$PROJECT_DIR\" ]]; then\n echo \"[Error] Instabug sourcemaps script must be invoked by Xcode\"\n exit 0\n fi\n\n local source_map_file=$(generate_sourcemaps | tail -n 1)\n\n local js_project_dir=\"$PROJECT_DIR/..\"\n local instabug_dir=$(dirname $(node -p \"require.resolve('instabug-reactnative/package.json')\"))\n local inferred_token=$(cd $js_project_dir && source $instabug_dir/scripts/find-token.sh)\n local app_token=$(resolve_var \"App Token\" \"INSTABUG_APP_TOKEN\" \"$inferred_token\" | tail -n 1)\n\n local inferred_name=$(/usr/libexec/PlistBuddy -c 'print CFBundleShortVersionString' \"$PROJECT_DIR/$INFOPLIST_FILE\")\n local version_name=$(resolve_var \"Version Name\" \"INSTABUG_APP_VERSION_NAME\" \"$inferred_name\" | tail -n 1)\n\n local inferred_code=$(/usr/libexec/PlistBuddy -c 'print CFBundleVersion' \"$PROJECT_DIR/$INFOPLIST_FILE\")\n local version_code=$(resolve_var \"Version Code\" \"INSTABUG_APP_VERSION_CODE\" \"$inferred_code\" | tail -n 1)\n\n node $instabug_dir/bin/index.js upload-sourcemaps \\\n --platform ios \\\n --file $source_map_file \\\n --token $app_token \\\n --name $version_name \\\n --code $version_code\n}\n\ngenerate_sourcemaps() {\n local react_native_dir=$(dirname $(node -p \"require.resolve('react-native/package.json')\"))\n\n # Fixes an issue with react-native prior to v0.67.0\n # For more info: https://github.com/facebook/react-native/issues/32168\n export RN_DIR=$react_native_dir\n\n # Used withing `react-native-xcode.sh` to generate sourcemap file\n export SOURCEMAP_FILE=\"$(pwd)/main.jsbundle.map\";\n\n source \"$react_native_dir/scripts/react-native-xcode.sh\"\n\n if [[ ! -f \"$SOURCEMAP_FILE\" ]]; then\n echo \"[Error] Unable to find source map file at: $SOURCEMAP_FILE\"\n exit 0\n fi\n\n echo $SOURCEMAP_FILE\n}\n\nresolve_var() {\n local name=$1\n local env_key=$2\n local default_value=$3\n\n local env_value=\"${!env_key}\"\n\n if [[ -n \"$env_value\" ]] && [[ -n \"$default_value\" ]] && [[ \"$env_value\" != default_value ]]; then\n echo \"[Warning] Environment variable \\`$env_key\\` might have incorrect value, make sure this was intentional:\"\n echo \" Environment Value: $env_value\"\n echo \" Default Value: $default_value\"\n fi\n\n local value=\"${env_value:-$default_value}\"\n\n if [[ -z \"$value\" ]]; then\n echo \"[Error] Unable to find $name! Set the environment variable \\`$env_key\\` and try again.\"\n exit 0\n fi\n\n echo $value\n}\n\nmain \"$@\"; exit\n";
381-
};
382-
887C85FF77114EE53BBBEA59 /* [CP] Check Pods Manifest.lock */ = {
383-
isa = PBXShellScriptBuildPhase;
384-
buildActionMask = 2147483647;
385-
files = (
386-
);
387-
inputFileListPaths = (
388-
);
389-
inputPaths = (
390-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
391-
"${PODS_ROOT}/Manifest.lock",
392-
);
393-
name = "[CP] Check Pods Manifest.lock";
394-
outputFileListPaths = (
395-
);
396-
outputPaths = (
397-
"$(DERIVED_FILE_DIR)/Pods-HybridSampleApp-checkManifestLockResult.txt",
398-
);
399-
runOnlyForDeploymentPostprocessing = 0;
400-
shellPath = /bin/sh;
401-
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";
402-
showEnvVarsInLog = 0;
403-
};
404404
/* End PBXShellScriptBuildPhase section */
405405

406406
/* Begin PBXSourcesBuildPhase section */
@@ -593,7 +593,7 @@
593593
};
594594
0CFE4DF52CC818D50003EEA7 /* Debug */ = {
595595
isa = XCBuildConfiguration;
596-
baseConfigurationReference = 186E35683F28099437AF6CB1 /* Pods-HybridSampleApp.debug.xcconfig */;
596+
baseConfigurationReference = 757F0F1B337DDAA4BB313C20 /* Pods-HybridSampleApp.debug.xcconfig */;
597597
buildSettings = {
598598
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
599599
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
@@ -623,7 +623,7 @@
623623
};
624624
0CFE4DF62CC818D50003EEA7 /* Release */ = {
625625
isa = XCBuildConfiguration;
626-
baseConfigurationReference = 021B14A90620D99B9917EC1C /* Pods-HybridSampleApp.release.xcconfig */;
626+
baseConfigurationReference = B69F4A0DCC5DED4E42E99249 /* Pods-HybridSampleApp.release.xcconfig */;
627627
buildSettings = {
628628
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
629629
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;

examples/hybrid/ios/Podfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,6 @@ target 'HybridSampleApp' do
3535
# necessary for Mac Catalyst builds
3636
:mac_catalyst_enabled => false
3737
)
38+
__apply_Xcode_12_5_M1_post_install_workaround(installer)
3839
end
3940
end

0 commit comments

Comments
 (0)