Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies from forks to use release tags #3651

Merged
merged 24 commits into from
Jul 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions bin/generate-podspecs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,21 @@ if [[ -z "$COMMIT_HASH" ]]; then
fi

DEST="${WD}/third-party-podspecs"
read -r -p "Please delete '$DEST' folder manually before continuing. This script will re-generate it. Did you delete it? [y/N] " PROMPT_RESPONSE_2
if [[ $PROMPT_RESPONSE_2 != "y" ]]; then
echo "Aborting."
exit 1
fi

mkdir $DEST
fluiddot marked this conversation as resolved.
Show resolved Hide resolved

NODE_MODULES_DIR="gutenberg/node_modules"

# Generate the external (non-RN podspecs)
EXTERNAL_PODSPECS=$(find "$NODE_MODULES_DIR/react-native/third-party-podspecs" \
"$NODE_MODULES_DIR/@react-native-community/blur" \
"$NODE_MODULES_DIR/@react-native-community/masked-view" \
"$NODE_MODULES_DIR/@react-native-community/slider" \
"$NODE_MODULES_DIR/react-native-dark-mode" \
"$NODE_MODULES_DIR/react-native-gesture-handler" \
"$NODE_MODULES_DIR/react-native-get-random-values" \
"$NODE_MODULES_DIR/react-native-keyboard-aware-scroll-view" \
Expand All @@ -63,14 +70,6 @@ do
echo "Generating podspec for $pod"
pod ipc spec "$podspec" > "$DEST/$pod.podspec.json"

# react-native-slider is the only gutenberg-mobile fork where we don't use the native files from the original repo
if [[ "$pod" == "react-native-slider" ]]; then
echo " ==> Patching $pod podspec"
TMP_RNSliderSpec=$(mktemp)
jq '.source.git = "https://github.com/wordpress-mobile/react-native-slider.git" | .source.commit = "d263ff16cdd9fb7352b354342522ff030f220f42" | del(.source.tag)' "$DEST/$pod.podspec.json" > "$TMP_RNSliderSpec"
mv "$TMP_RNSliderSpec" "$DEST/$pod.podspec.json"
fi

# react-native-blur doesn't have a tag field in it's podspec
if [[ "$pod" == "react-native-blur" ]]; then
echo " ==> Patching $pod podspec"
Expand Down
151 changes: 68 additions & 83 deletions bundle/ios/App.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/App.js.map

Large diffs are not rendered by default.

Loading