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

Upgrade React Native to 0.63 #2580

Closed
wants to merge 32 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
41a0f75
Update RN version to 0.62.2
SergioEstevao Jun 29, 2020
dee206c
Update patch file for version 0.62.2
SergioEstevao Jun 29, 2020
75c0518
Include h files in podspecs.
SergioEstevao Jun 29, 2020
e6c049d
Update package and lock file.
SergioEstevao Jun 29, 2020
5bf55cd
Merge branch 'develop' into try/update_RN_0.62.2
SergioEstevao Jul 8, 2020
dd5c1f3
Update GB reference.
SergioEstevao Jul 13, 2020
478c046
Update GB reference.
SergioEstevao Jul 13, 2020
9052b88
Merge branch 'develop' into try/update_RN_0.62.2
SergioEstevao Jul 13, 2020
ab825d4
Fix react-native-editor version.
SergioEstevao Jul 13, 2020
619342d
Update npm run to use install instead of ci.
SergioEstevao Jul 14, 2020
104428a
Merge branch 'develop' into try/update_RN_0.62.2
ceyhun Aug 24, 2020
9e776ef
Move react-native patch
ceyhun Aug 24, 2020
7e7318f
Update RN related packages to use 0.63 compatible versions
ceyhun Aug 25, 2020
441965e
Update bintray repo script after monorepo
ceyhun Aug 26, 2020
3f5ee3d
Remove metro patch that's no longer needed
ceyhun Aug 26, 2020
a144cd0
Update podspecs via running generate-podspecs.sh
ceyhun Aug 27, 2020
ddef2fe
Update gutenberg ref
ceyhun Aug 27, 2020
19193b5
Add.h files to RCTBlob podspec
ceyhun Aug 27, 2020
8ceb9d2
Update gutenberg ref
ceyhun Oct 1, 2020
948c344
Update gutenberg ref
ceyhun Oct 30, 2020
6a4bc83
Merge branch 'develop' into try/upgrade_to_RN_0.63
ceyhun Oct 30, 2020
8aefc2e
Fix bundle commands
ceyhun Oct 30, 2020
d90a570
Bust iOS build cache
ceyhun Oct 30, 2020
02e26b5
Fix build cache check
ceyhun Nov 10, 2020
fe4ec5c
Merge branch 'develop' into try/upgrade_to_RN_0.63
ceyhun Nov 10, 2020
aec458b
Fix hermes CLI name
ceyhun Nov 10, 2020
c80bb43
Update gutenberg ref
ceyhun Nov 10, 2020
11554e1
Update gutenberg ref
ceyhun Nov 11, 2020
bc596c8
Update bundles
ceyhun Nov 11, 2020
7bec31b
Update gutenberg ref
ceyhun Nov 11, 2020
c662256
Updated gutenberg ref
cameronvoell Jan 6, 2021
b16c8d2
Updating bundle
cameronvoell Jan 6, 2021
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
5 changes: 1 addition & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,12 +189,9 @@ jobs:
name: Restore Dependencies Cache
keys:
- dependencies-v4-{{ checksum "gutenberg/packages/react-native-editor/ios/Gemfile.lock" }}-{{ checksum "gutenberg/packages/react-native-editor/ios/Podfile.lock" }}-{{ checksum "gutenberg/package-lock.json" }}
- dependencies-v4-{{ checksum "gutenberg/packages/react-native-editor/ios/Gemfile.lock" }}-{{ checksum "gutenberg/packages/react-native-editor/ios/Podfile.lock" }}
- dependencies-v4-{{ checksum "gutenberg/packages/react-native-editor/ios/Gemfile.lock" }}
- dependencies-v4-
- run:
name: Build (if needed)
command: test -e gutenberg/packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app || npm run core test:e2e:build-app:ios
command: test -e gutenberg/packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app/GutenbergDemo || npm run core test:e2e:build-app:ios
- save_cache:
name: Save Dependencies Cache
key: dependencies-v4-{{ checksum "gutenberg/packages/react-native-editor/ios/Gemfile.lock" }}-{{ checksum "gutenberg/packages/react-native-editor/ios/Podfile.lock" }}-{{ checksum "gutenberg/package-lock.json" }}
Expand Down
1 change: 0 additions & 1 deletion bin/generate-podspecs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ EXTERNAL_PODSPECS=$(find "$NODE_MODULES_DIR/react-native/third-party-podspecs" \
"$NODE_MODULES_DIR/react-native-svg" \
"$NODE_MODULES_DIR/react-native-keyboard-aware-scroll-view" \
"$NODE_MODULES_DIR/react-native-safe-area" \
"$NODE_MODULES_DIR/react-native-dark-mode" \
"$NODE_MODULES_DIR/react-native-get-random-values" -type f -name "*.podspec" -print)

for podspec in $EXTERNAL_PODSPECS
Expand Down
12 changes: 6 additions & 6 deletions bin/update-bintray-repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
command -v jfrog > /dev/null || { echo "jfrog-cli-go is required to update the repo. Install it with 'brew install jfrog-cli-go'" >&2; exit 1; }
# Check for xmlstarlet
command -v xmlstarlet > /dev/null || { echo "xmlstarlet is required to update the repo. Install it with 'brew install xmlstarlet'" >&2; exit 1; }
# Check for jq
command -v jq > /dev/null || { echo "jq is required to update the repo. Install it with 'brew install jq'" >&2; exit 1; }

# Exit if any command fails
set -e
Expand All @@ -16,6 +18,7 @@ TMP_WORKING_DIRECTORY=$(mktemp -d)

BINTRAY_REPO="wordpress-mobile/react-native-mirror"
PACKAGE_PATHS=("node_modules/react-native/android/com/facebook/react/react-native" "node_modules/jsc-android/dist/org/webkit/android-jsc")
RN_VERSION=$(jq --raw-output '.devDependencies."react-native"' "gutenberg/package.json")

package_name () {
local PACKAGE_PATH="$1"
Expand Down Expand Up @@ -52,13 +55,10 @@ echo "Please sign into Bintray..."
echo "You can find your Bintray API key here: https://bintray.com/profile/edit"
jfrog bt config

# Yarn install
echo "Running yarn install in '${TMP_WORKING_DIRECTORY}'..."
cp "package.json" "${TMP_WORKING_DIRECTORY}/"
cp "yarn.lock" "${TMP_WORKING_DIRECTORY}/"
cp -Ra "i18n-cache" "${TMP_WORKING_DIRECTORY}/"
# npm install
echo "Running npm install react-native@${RN_VERSION} in '${TMP_WORKING_DIRECTORY}'..."
cd "${TMP_WORKING_DIRECTORY}"
yarn install --silent
npm install react-native@${RN_VERSION}

# Find local packages in node_modules/
echo "Getting local package details..."
Expand Down
2 changes: 0 additions & 2 deletions bundle/android/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
<string name="gutenberg_native_add_video" tools:ignore="UnusedResources">ADD VIDEO</string>
<string name="gutenberg_native_alt_text" tools:ignore="UnusedResources">Alt Text</string>
<string name="gutenberg_native_an_unknown_error_occurred_please_try_again" tools:ignore="UnusedResources">An unknown error occurred. Please try again.</string>
<string name="gutenberg_native_angle" tools:ignore="UnusedResources">Angle</string>
<string name="gutenberg_native_annotations_sidebar" tools:ignore="UnusedResources">Annotations Sidebar</string>
<!-- translators: displayed right after the block is copied. -->
<string name="gutenberg_native_block_copied" tools:ignore="UnusedResources">Block copied</string>
Expand Down Expand Up @@ -207,7 +206,6 @@ translators: sample content for "Services" page template -->
<!-- translators: Checkbox toggle label -->
<string name="gutenberg_native_show_section" tools:ignore="UnusedResources">Show section</string>
<string name="gutenberg_native_sidebar_title_plugin" tools:ignore="UnusedResources">Sidebar title plugin</string>
<string name="gutenberg_native_size" tools:ignore="UnusedResources">Size</string>
<string name="gutenberg_native_start_writing" tools:ignore="UnusedResources">Start writing…</string>
<!-- translators: sample content for "Services" page template -->
<string name="gutenberg_native_strategy" tools:ignore="UnusedResources">Strategy</string>
Expand Down
Loading