Merge branch 'develop' into gutenberg/issue/3163-gss

wordpress-mobile · Jun 16, 2021 · 68ea549 · 68ea549
2 parents 46fa5e5 + 95bd4c3
commit 68ea549
Show file tree

Hide file tree

Showing 8 changed files with 408 additions and 429 deletions.
diff --git a/Podfile b/Podfile
@@ -100,7 +100,6 @@ end
 
 def gutenberg_dependencies(options)
     dependencies = [
-        'FBReactNativeSpec',
         'FBLazyVector',
         'React',
         'ReactCommon',
@@ -117,12 +116,15 @@ def gutenberg_dependencies(options)
         'React-RCTSettings',
         'React-RCTText',
         'React-RCTVibration',
+        'React-callinvoker',
         'React-cxxreact',
         'React-jsinspector',
         'React-jsi',
         'React-jsiexecutor',
+        'React-perflogger',
+        'React-runtimeexecutor',
         'Yoga',
-        'Folly',
+        'RCT-Folly',
         'glog',
         'react-native-keyboard-aware-scroll-view',
         'react-native-safe-area',
@@ -131,7 +133,7 @@ def gutenberg_dependencies(options)
         'RNSVG',
         'ReactNativeDarkMode',
         'react-native-slider',
-        'react-native-linear-gradient',
+        'BVLinearGradient',
         'react-native-get-random-values',
         'react-native-blur',
         'RNScreens',
@@ -145,6 +147,9 @@ def gutenberg_dependencies(options)
         tag_or_commit = options[:tag] || options[:commit]
         podspec_prefix = "https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/#{tag_or_commit}"
     end
+
+    # FBReactNativeSpec needs special treatment because of react-native-codegen code generation
+    pod 'FBReactNativeSpec', :podspec => "#{podspec_prefix}/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json"
 
     for pod_name in dependencies do
         pod pod_name, :podspec => "#{podspec_prefix}/third-party-podspecs/#{pod_name}.podspec.json"
@@ -161,7 +166,7 @@ abstract_target 'Apps' do
     ## Gutenberg (React Native)
     ## =====================
     ##
-    gutenberg :tag => 'v1.55.0'
+    gutenberg :tag => 'v1.56.0-alpha1'
 
     ## Third party libraries
     ## =====================
@@ -416,19 +421,6 @@ end
 post_install do |installer|
     project_root = File.dirname(__FILE__)
 
-    puts 'Patching RTCxxBridge and RTCTurboModuleManager for Xcode 12.5'
-    %x(patch "#{project_root}/Pods/React-Core/React/CxxBridge/RCTCxxBridge.mm" < "#{project_root}/patches/RCTCxxBridge.patch")
-    %x(patch "#{project_root}/Pods/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm" < "#{project_root}/patches/RCTTurboModuleManager.patch")
-
-    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")
-
     ## Convert the 3rd-party license acknowledgements markdown into html for use in the app
     require 'commonmarker'