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.

Sign up for GitHub

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

Jump to bottom

Upgrade React Native to 0.63 #14776

Closed
wants to merge 35 commits into from
Closed

Upgrade React Native to 0.63 #14776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
767cca9
Update podfile to point to rn 0.62.0 update
marecar3 Mar 26, 2020
6d52c8a
Merge branch 'develop' into gutenberg/upgrade-RN-0-62
marecar3 Mar 27, 2020
63b22e2
Update gutenberg reference
marecar3 Mar 27, 2020
7038a71
Update Gutenberg reference in the pod.
SergioEstevao Mar 27, 2020
60e127b
Update GB reference.
SergioEstevao Mar 27, 2020
a19b2d8
Merge branch 'develop' into gutenberg/upgrade-RN-0-62
marecar3 Mar 28, 2020
e65925f
update pods
marecar3 Mar 28, 2020
789fedb
Merge branch 'develop' into gutenberg/upgrade-RN-0-62
marecar3 Apr 4, 2020
bc26273
Point to gb mobile RN 0.62.1 reference
marecar3 Apr 4, 2020
c4640f2
Merge branch 'develop' into gutenberg/upgrade-RN-0-62
marecar3 Apr 6, 2020
a6941ea
Update Pod files with latest RN 0.62.1
marecar3 Apr 6, 2020
041904f
Merge branch 'develop' into gutenberg/upgrade-RN-0-62
marecar3 Apr 6, 2020
9a54f88
Merge branch 'develop' into gutenberg/upgrade-RN-0-62
marecar3 Apr 7, 2020
ff20481
Update podfile with latest gb mobile refrence
marecar3 Apr 7, 2020
458b1fe
Update podfile with the latest gb mobile reference
marecar3 Apr 7, 2020
c52ec2d
Update podfile with latest gutenberg mobile reference
marecar3 Apr 7, 2020
9940de7
Merge branch 'develop' into gutenberg/upgrade-RN-0-62
marecar3 Apr 9, 2020
0e7d743
Merge branch 'develop' into gutenberg/upgrade-RN-0-62
marecar3 Apr 21, 2020
85e81d2
Remove patch reference.
SergioEstevao Apr 22, 2020
26d6d2f
Update GB version.
SergioEstevao Apr 22, 2020
54004df
Merge branch 'develop' into gutenberg/upgrade-RN-0-62
marecar3 Apr 22, 2020
0f45f3b
Update podfile
marecar3 Apr 22, 2020
aff7eaf
Patch ActionSheet to add possibility to disable buttons
lukewalczak May 27, 2020
14081ab
Merge branch 'develop' into gutenberg/upgrade-RN-0-62
SergioEstevao Jun 29, 2020
bac981e
Merge branch 'develop' into gutenberg/upgrade-RN-0-63
ceyhun Aug 27, 2020
b96f319
Update gutenberg ref
ceyhun Aug 27, 2020
4992c69
Update gutenberg ref
ceyhun Aug 27, 2020
b8cbc60
Update Podfile.lock
ceyhun Aug 27, 2020
f3afdc6
Remove RN-RCTShadowView patch
ceyhun Oct 1, 2020
0cd1c46
Remove old RCTActionSheetManager patch
ceyhun Oct 1, 2020
6bc4eeb
Update RN patches for version 0.63
ceyhun Oct 1, 2020
9a3739e
Update gutenberg ref
ceyhun Oct 1, 2020
ec1eed7
Merge branch 'develop' into gutenberg/upgrade-RN-0-63
ceyhun Nov 11, 2020
47b39b8
Update gutenberg ref
ceyhun Nov 11, 2020
cbb7074
Updated gutenberg ref
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
13 changes: 6 additions & 7 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ def gutenberg_dependencies(options)
'React-RCTSettings',
'React-RCTText',
'React-RCTVibration',
'React-callinvoker',
'React-cxxreact',
'React-jsinspector',
'React-jsi',
Expand Down Expand Up @@ -154,7 +155,7 @@ target 'WordPress' do
## Gutenberg (React Native)
## =====================
##
gutenberg :tag => 'v1.40.0'
gutenberg :commit => 'b16c8d2fb12ad225fce33c4be855d4ee62486d6e'

## Third party libraries
## =====================
Expand Down Expand Up @@ -222,14 +223,12 @@ target 'WordPress' do
post_install do |installer|
project_root = File.dirname(__FILE__)

puts 'Patching RCTShadowView to fix nested group block - it could be removed after upgrade to 0.62'
%x(patch "#{project_root}/Pods/React-Core/React/Views/RCTShadowView.m" < "#{project_root}/patches/RN-RCTShadowView.patch")
puts 'Patching RCTActionSheet to add possibility to disable action sheet buttons -
it could be removed once PR with that functionality will be merged into RN'
%x(patch "#{project_root}/Pods/React-RCTActionSheet/RCTActionSheetManager.m" < "#{project_root}/patches/RN-RCTActionSheetManager.patch")
puts 'Patching RCTUIImageViewAnimated to fix a problem where images will not load when built using the iOS 14 SDK (Xcode 12) -
it can be removed once we upgrade Gutenberg to use RN 0.63 or later'
%x(patch "#{project_root}/Pods/React-RCTImage/RCTUIImageViewAnimated.m" < "#{project_root}/patches/RN-RCTUIImageViewAnimated.patch")
%x(patch "#{project_root}/Pods/React-CoreModules/RCTActionSheetManager.mm" < "#{project_root}/patches/RN-RCTActionSheetManager.patch")
puts 'Patching FBReactNativeSpec to add possibility to disable action sheet buttons -
it could be removed once PR with that functionality will be merged into RN'
%x(patch "#{project_root}/Pods/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h" < "#{project_root}/patches/FBReactNativeSpec.patch")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might fall too far outside of the scope of what we're trying to take on here (update to RN 0.63) but I wonder if it would be possible to apply the suggested changes from #14240 since we're modifying these patches.

#14240

So, instead of using %x(...) can we experiment with replacing that line with system('patch ... < ...') || exit(1). system(...) returns the exit value of the shell so it can help us detecting when the patch fails. But, we should make sure it is not producing false positives and causing the termination of the process unnecessarily.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think with the 0.64 upgrade none of these patches here will be necessary anymore. This final remaining patch seems to be merged into 0.64.


## Convert the 3rd-party license acknowledgements markdown into html for use in the app
require 'commonmarker'
Expand Down
Loading