microsoft
/
react-native-macos
зеркало из https://github.com/microsoft/react-native-macos.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bump flipper deps to 0.91 to support XCode 12.5 out of the box (#31562) 

Summary:
allow-large-files

This bumps the flipper dependencies to 0.91.

Fresco deps are not in mavenCentral jet, so picked those from bintray, but pinged the team and they'll follow up on it. See also: https://github.com/facebook/fresco/issues/2603

This primarily bumps to the latest pods we have everywhere, which solves several build issues, like reported in https://github.com/facebook/react-native/issues/31480

After this change it should no longer be needed to pass custom version overrides to `use_flipper`, as the defaults will be up to date.

In the template project, I changed the version rangers to exact numbers, so that results of `react-native init` are more consistent / predictable over time, as suggested in the discord channel by Brent

In the long term we are investigating whether we can remove most of the transitive deps by not using RSocket, which is a bigger project plan that should help reduce build issues and times, especially on iOS.

cc priteshrnandgaonkar  passy kelset

## Changelog

[general][changed] - [iOS] Update Flipper to 0.91.1, fixed iOS build support for i386, `use_flipper!()` will no longer need custom overrides to build with XCode 12.5

Pull Request resolved: https://github.com/facebook/react-native/pull/31562

Test Plan:
_N.B. Locally tested in XCode 12.4 only, but bumped versions have been confirmed to work on 12.5 before by others_

* React Native CI
* Flipper CI with same versions of deps: https://github.com/facebook/flipper/actions/runs/863607686
* Was able to connect from both Android and iOS to Flipper. Couldn't really test further due to a bundling error I didn't understand, suggestions welcome

![Screenshot 2021-05-21 at 11 32 52](https://user-images.githubusercontent.com/1820292/119133806-3d090880-ba34-11eb-8c0b-1ede7bc13751.png)
![Screenshot 2021-05-21 at 12 59 13](https://user-images.githubusercontent.com/1820292/119133892-5c079a80-ba34-11eb-9e72-278c427fdeb0.png)

Reviewed By: fkgozali

Differential Revision: D28623601

Pulled By: mweststrate

fbshipit-source-id: 22130d07821569851956453c4ee6a594b6b83928
This commit is contained in:
Michel Weststrate 2021-06-07 03:18:49 -07:00 коммит произвёл Facebook GitHub Bot
Родитель c774f9e97e
Коммит 4246c75d0d
2 изменённых файлов: 77 добавлений и 53 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

116
packages/rn-tester/Podfile.lock
Просмотреть файл

@ -10,50 +10,64 @@ PODS:
- React-Core (= 1000.0.0) - React-Core (= 1000.0.0)
- React-jsi (= 1000.0.0) - React-jsi (= 1000.0.0)
- ReactCommon/turbomodule/core (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0)
- Flipper (0.75.1): - Flipper (0.91.1):
- Flipper-Folly (~> 2.5) - Flipper-Folly (~> 2.6)
- Flipper-RSocket (~> 1.3) - Flipper-RSocket (~> 1.4)
- Flipper-DoubleConversion (1.1.7) - Flipper-Boost-iOSX (1.76.0.1.11)
- Flipper-Folly (2.5.3): - Flipper-DoubleConversion (3.1.7)
- boost-for-react-native - Flipper-Fmt (7.1.7)
- Flipper-Folly (2.6.7):
- Flipper-Boost-iOSX
- Flipper-DoubleConversion - Flipper-DoubleConversion
- Flipper-Fmt (= 7.1.7)
- Flipper-Glog - Flipper-Glog
- libevent (~> 2.1.12) - libevent (~> 2.1.12)
- OpenSSL-Universal (= 1.1.180) - OpenSSL-Universal (= 1.1.180)
- Flipper-Glog (0.3.6) - Flipper-Glog (0.3.6)
- Flipper-PeerTalk (0.0.4) - Flipper-PeerTalk (0.0.4)
- Flipper-RSocket (1.3.1): - Flipper-RSocket (1.4.3):
- Flipper-Folly (~> 2.5) - Flipper-Folly (~> 2.6)
- FlipperKit (0.75.1): - FlipperKit (0.91.1):
- FlipperKit/Core (= 0.75.1) - FlipperKit/Core (= 0.91.1)
- FlipperKit/Core (0.75.1): - FlipperKit/Core (0.91.1):
- Flipper (~> 0.75.1) - Flipper (~> 0.91.1)
- FlipperKit/CppBridge - FlipperKit/CppBridge
- FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBCxxFollyDynamicConvert
- FlipperKit/FBDefines - FlipperKit/FBDefines
- FlipperKit/FKPortForwarding - FlipperKit/FKPortForwarding
- FlipperKit/CppBridge (0.75.1): - FlipperKit/CppBridge (0.91.1):
- Flipper (~> 0.75.1) - Flipper (~> 0.91.1)
- FlipperKit/FBCxxFollyDynamicConvert (0.75.1): - FlipperKit/FBCxxFollyDynamicConvert (0.91.1):
- Flipper-Folly (~> 2.5) - Flipper-Folly (~> 2.6)
- FlipperKit/FBDefines (0.75.1) - FlipperKit/FBDefines (0.91.1)
- FlipperKit/FKPortForwarding (0.75.1): - FlipperKit/FKPortForwarding (0.91.1):
- CocoaAsyncSocket (~> 7.6) - CocoaAsyncSocket (~> 7.6)
- Flipper-PeerTalk (~> 0.0.4) - Flipper-PeerTalk (~> 0.0.4)
- FlipperKit/FlipperKitHighlightOverlay (0.75.1) - FlipperKit/FlipperKitHighlightOverlay (0.91.1)
- FlipperKit/FlipperKitLayoutPlugin (0.75.1): - FlipperKit/FlipperKitLayoutHelpers (0.91.1):
- FlipperKit/Core - FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutTextSearchable - FlipperKit/FlipperKitLayoutTextSearchable
- FlipperKit/FlipperKitLayoutIOSDescriptors (0.91.1):
- FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutHelpers
- YogaKit (~> 1.18) - YogaKit (~> 1.18)
- FlipperKit/FlipperKitLayoutTextSearchable (0.75.1) - FlipperKit/FlipperKitLayoutPlugin (0.91.1):
- FlipperKit/FlipperKitNetworkPlugin (0.75.1):
- FlipperKit/Core - FlipperKit/Core
- FlipperKit/FlipperKitReactPlugin (0.75.1): - FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutHelpers
- FlipperKit/FlipperKitLayoutIOSDescriptors
- FlipperKit/FlipperKitLayoutTextSearchable
- YogaKit (~> 1.18)
- FlipperKit/FlipperKitLayoutTextSearchable (0.91.1)
- FlipperKit/FlipperKitNetworkPlugin (0.91.1):
- FlipperKit/Core - FlipperKit/Core
- FlipperKit/FlipperKitUserDefaultsPlugin (0.75.1): - FlipperKit/FlipperKitReactPlugin (0.91.1):
- FlipperKit/Core - FlipperKit/Core
- FlipperKit/SKIOSNetworkPlugin (0.75.1): - FlipperKit/FlipperKitUserDefaultsPlugin (0.91.1):
- FlipperKit/Core
- FlipperKit/SKIOSNetworkPlugin (0.91.1):
- FlipperKit/Core - FlipperKit/Core
- FlipperKit/FlipperKitNetworkPlugin - FlipperKit/FlipperKitNetworkPlugin
- fmt (6.2.1) - fmt (6.2.1)
@ -701,25 +715,27 @@ DEPENDENCIES:
- DoubleConversion (from `../../third-party-podspecs/DoubleConversion.podspec`) - DoubleConversion (from `../../third-party-podspecs/DoubleConversion.podspec`)
- FBLazyVector (from `../../Libraries/FBLazyVector`) - FBLazyVector (from `../../Libraries/FBLazyVector`)
- FBReactNativeSpec (from `../../React/FBReactNativeSpec`) - FBReactNativeSpec (from `../../React/FBReactNativeSpec`)
- Flipper (~> 0.75.1) - Flipper (= 0.91.1)
- Flipper-DoubleConversion (= 1.1.7) - Flipper-Boost-iOSX (= 1.76.0.1.11)
- Flipper-Folly (~> 2.5.3) - Flipper-DoubleConversion (= 3.1.7)
- Flipper-Fmt (= 7.1.7)
- Flipper-Folly (= 2.6.7)
- Flipper-Glog (= 0.3.6) - Flipper-Glog (= 0.3.6)
- Flipper-PeerTalk (~> 0.0.4) - Flipper-PeerTalk (= 0.0.4)
- Flipper-RSocket (~> 1.3) - Flipper-RSocket (= 1.4.3)
- FlipperKit (~> 0.75.1) - FlipperKit (= 0.91.1)
- FlipperKit/Core (~> 0.75.1) - FlipperKit/Core (= 0.91.1)
- FlipperKit/CppBridge (~> 0.75.1) - FlipperKit/CppBridge (= 0.91.1)
- FlipperKit/FBCxxFollyDynamicConvert (~> 0.75.1) - FlipperKit/FBCxxFollyDynamicConvert (= 0.91.1)
- FlipperKit/FBDefines (~> 0.75.1) - FlipperKit/FBDefines (= 0.91.1)
- FlipperKit/FKPortForwarding (~> 0.75.1) - FlipperKit/FKPortForwarding (= 0.91.1)
- FlipperKit/FlipperKitHighlightOverlay (~> 0.75.1) - FlipperKit/FlipperKitHighlightOverlay (= 0.91.1)
- FlipperKit/FlipperKitLayoutPlugin (~> 0.75.1) - FlipperKit/FlipperKitLayoutPlugin (= 0.91.1)
- FlipperKit/FlipperKitLayoutTextSearchable (~> 0.75.1) - FlipperKit/FlipperKitLayoutTextSearchable (= 0.91.1)
- FlipperKit/FlipperKitNetworkPlugin (~> 0.75.1) - FlipperKit/FlipperKitNetworkPlugin (= 0.91.1)
- FlipperKit/FlipperKitReactPlugin (~> 0.75.1) - FlipperKit/FlipperKitReactPlugin (= 0.91.1)
- FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.75.1) - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.91.1)
- FlipperKit/SKIOSNetworkPlugin (~> 0.75.1) - FlipperKit/SKIOSNetworkPlugin (= 0.91.1)
- glog (from `../../third-party-podspecs/glog.podspec`) - glog (from `../../third-party-podspecs/glog.podspec`)
- RCT-Folly (from `../../third-party-podspecs/RCT-Folly.podspec`) - RCT-Folly (from `../../third-party-podspecs/RCT-Folly.podspec`)
- RCT-Folly/Fabric (from `../../third-party-podspecs/RCT-Folly.podspec`) - RCT-Folly/Fabric (from `../../third-party-podspecs/RCT-Folly.podspec`)
@ -761,7 +777,9 @@ SPEC REPOS:
- boost-for-react-native - boost-for-react-native
- CocoaAsyncSocket - CocoaAsyncSocket
- Flipper - Flipper
- Flipper-Boost-iOSX
- Flipper-DoubleConversion - Flipper-DoubleConversion
- Flipper-Fmt
- Flipper-Folly - Flipper-Folly
- Flipper-Glog - Flipper-Glog
- Flipper-PeerTalk - Flipper-PeerTalk
@ -846,13 +864,15 @@ SPEC CHECKSUMS:
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
FBLazyVector: b81a2b70c72d8b0aefb652cea22c11e9ffd02949 FBLazyVector: b81a2b70c72d8b0aefb652cea22c11e9ffd02949
FBReactNativeSpec: 9317c06a8fcc6ff3de6f045d45186523d4fe3458 FBReactNativeSpec: 9317c06a8fcc6ff3de6f045d45186523d4fe3458
Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021 Flipper: 0f8a5accb30d2ec9c3e85e820ce00c3b72a486f3
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c
Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
Flipper-Folly: 83af37379faa69497529e414bd43fbfc7cae259a
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154 Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00 FlipperKit: 4bce4a1dc0b2178ad9cbb2a2c9ca0b5e5c0ecfdc
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 5337263514dd6f09803962437687240c5dc39aa4 glog: 5337263514dd6f09803962437687240c5dc39aa4
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913

14
scripts/react_native_pods.rb
Просмотреть файл

@ -69,12 +69,14 @@ def use_react_native! (options={})
end end
def use_flipper!(versions = {}, configurations: ['Debug']) def use_flipper!(versions = {}, configurations: ['Debug'])
versions['Flipper'] ||= '~> 0.75.1' versions['Flipper'] ||= '0.91.1'
versions['Flipper-DoubleConversion'] ||= '1.1.7' versions['Flipper-Boost-iOSX'] ||= '1.76.0.1.11'
versions['Flipper-Folly'] ||= '~> 2.5.3' versions['Flipper-DoubleConversion'] ||= '3.1.7'
versions['Flipper-Fmt'] ||= '7.1.7'
versions['Flipper-Folly'] ||= '2.6.7'
versions['Flipper-Glog'] ||= '0.3.6' versions['Flipper-Glog'] ||= '0.3.6'
versions['Flipper-PeerTalk'] ||= '~> 0.0.4' versions['Flipper-PeerTalk'] ||= '0.0.4'
versions['Flipper-RSocket'] ||= '~> 1.3' versions['Flipper-RSocket'] ||= '1.4.3'
pod 'FlipperKit', versions['Flipper'], :configurations => configurations pod 'FlipperKit', versions['Flipper'], :configurations => configurations
pod 'FlipperKit/FlipperKitLayoutPlugin', versions['Flipper'], :configurations => configurations pod 'FlipperKit/FlipperKitLayoutPlugin', versions['Flipper'], :configurations => configurations
pod 'FlipperKit/SKIOSNetworkPlugin', versions['Flipper'], :configurations => configurations pod 'FlipperKit/SKIOSNetworkPlugin', versions['Flipper'], :configurations => configurations
@ -83,7 +85,9 @@ def use_flipper!(versions = {}, configurations: ['Debug'])
# List all transitive dependencies for FlipperKit pods # List all transitive dependencies for FlipperKit pods
# to avoid them being linked in Release builds # to avoid them being linked in Release builds
pod 'Flipper', versions['Flipper'], :configurations => configurations pod 'Flipper', versions['Flipper'], :configurations => configurations
pod 'Flipper-Boost-iOSX', versions['Flipper-Boost-iOSX'], :configurations => configurations
pod 'Flipper-DoubleConversion', versions['Flipper-DoubleConversion'], :configurations => configurations pod 'Flipper-DoubleConversion', versions['Flipper-DoubleConversion'], :configurations => configurations
pod 'Flipper-Fmt', versions['Flipper-Fmt'], :configurations => configurations
pod 'Flipper-Folly', versions['Flipper-Folly'], :configurations => configurations pod 'Flipper-Folly', versions['Flipper-Folly'], :configurations => configurations
pod 'Flipper-Glog', versions['Flipper-Glog'], :configurations => configurations pod 'Flipper-Glog', versions['Flipper-Glog'], :configurations => configurations
pod 'Flipper-PeerTalk', versions['Flipper-PeerTalk'], :configurations => configurations pod 'Flipper-PeerTalk', versions['Flipper-PeerTalk'], :configurations => configurations