Skip to content

Commit 1226c2d

Browse files
committed
Revert "fix: try pod install and android"
This reverts commit 9af1f0e.
1 parent d8ce54c commit 1226c2d

File tree

4 files changed

+5
-42
lines changed

4 files changed

+5
-42
lines changed

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
051446968CD6840DE1405937 /* libPods-HybridSampleApp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2348D2431F4989E260C46246 /* libPods-HybridSampleApp.a */; };
1011
0C21903C2CD3E63C00D7A037 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0CFE4DD12CC818D30003EEA7 /* Main.storyboard */; };
1112
0C3BA7932CD3D7380012085A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0CFE4DD62CC818D40003EEA7 /* LaunchScreen.storyboard */; };
1213
0CFE4DCA2CC818D30003EEA7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CFE4DC92CC818D30003EEA7 /* AppDelegate.m */; };
@@ -372,17 +373,10 @@
372373
buildActionMask = 2147483647;
373374
files = (
374375
);
375-
inputFileListPaths = (
376-
"${PODS_ROOT}/Target Support Files/Pods-HybridSampleApp/Pods-HybridSampleApp-resources-${CONFIGURATION}-input-files.xcfilelist",
377-
);
378-
name = "[CP] Copy Pods Resources";
379-
outputFileListPaths = (
380-
"${PODS_ROOT}/Target Support Files/Pods-HybridSampleApp/Pods-HybridSampleApp-resources-${CONFIGURATION}-output-files.xcfilelist",
381-
);
376+
name = "[CP-User] [instabug-reactnative] Upload Sourcemap";
382377
runOnlyForDeploymentPostprocessing = 0;
383378
shellPath = /bin/sh;
384-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-HybridSampleApp/Pods-HybridSampleApp-resources.sh\"\n";
385-
showEnvVarsInLog = 0;
379+
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";
386380
};
387381
F64C6BD92EBE0B86387624CF /* [CP] Embed Pods Frameworks */ = {
388382
isa = PBXShellScriptBuildPhase;

examples/hybrid/ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ EXTERNAL SOURCES:
583583

584584
SPEC CHECKSUMS:
585585
Base64: cecfb41a004124895a7bcee567a89bae5a89d49b
586-
boost: 64032b9e9b938fda23325e68a3771f0fabf414dc
586+
boost: 57d2868c099736d80fcd648bf211b4431e51a558
587587
CodePush: ea174f879b85dff65380bee54243bbe523ea16b2
588588
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
589589
FBLazyVector: 4cce221dd782d3ff7c4172167bba09d58af67ccb
@@ -631,6 +631,6 @@ SPEC CHECKSUMS:
631631
SSZipArchive: c69881e8ac5521f0e622291387add5f60f30f3c4
632632
Yoga: 8796b55dba14d7004f980b54bcc9833ee45b28ce
633633

634-
PODFILE CHECKSUM: 9a2ed7da3e725fc0ebcaccdd52555a91c1a0de0a
634+
PODFILE CHECKSUM: f0a49ea7e3045fdea84ba77de8fe027e46373cea
635635

636636
COCOAPODS: 1.16.2

examples/hybrid/patches/react-native+0.72.3.patch

Lines changed: 0 additions & 26 deletions
This file was deleted.

examples/hybrid/yarn.lock

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8864,11 +8864,6 @@ possible-typed-array-names@^1.0.0:
88648864
resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
88658865
integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==
88668866

8867-
postinstall-postinstall@^2.1.0:
8868-
version "2.1.0"
8869-
resolved "https://registry.yarnpkg.com/postinstall-postinstall/-/postinstall-postinstall-2.1.0.tgz#4f7f77441ef539d1512c40bd04c71b06a4704ca3"
8870-
integrity sha512-7hQX6ZlZXIoRiWNrbMQaLzUUfH+sSx39u8EJ9HYuDc1kLo9IXKWjM5RSquZN1ad5GnH8CGFM78fsAAQi3OKEEQ==
8871-
88728867
88738868
version "2.8.8"
88748869
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"

0 commit comments

Comments
 (0)