diff --git a/react-native/ReactNativeFlipperExample/ios/Podfile b/react-native/ReactNativeFlipperExample/ios/Podfile index b5514586a..53d6c1c29 100644 --- a/react-native/ReactNativeFlipperExample/ios/Podfile +++ b/react-native/ReactNativeFlipperExample/ios/Podfile @@ -1,13 +1,36 @@ -platform :ios, '9.0' +platform :ios, '11.0' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' -def add_flipper_pods! - version = '~> 0.33.1' - pod 'FlipperKit', version, :configuration => 'Debug' - pod 'FlipperKit/FlipperKitLayoutPlugin', version, :configuration => 'Debug' - pod 'FlipperKit/SKIOSNetworkPlugin', version, :configuration => 'Debug' - pod 'FlipperKit/FlipperKitUserDefaultsPlugin', version, :configuration => 'Debug' - pod 'FlipperKit/FlipperKitReactPlugin', version, :configuration => 'Debug' +def add_flipper_pods!(versions = {}) + versions['Flipper'] ||= '~> 0.44.0' + versions['DoubleConversion'] ||= '1.1.7' + versions['Flipper-Folly'] ||= '~> 2.1' + versions['Flipper-Glog'] ||= '0.3.6' + versions['Flipper-PeerTalk'] ||= '~> 0.0.4' + versions['Flipper-RSocket'] ||= '~> 1.0' + + pod 'FlipperKit', versions['Flipper'], :configuration => 'Debug' + pod 'FlipperKit/FlipperKitLayoutPlugin', versions['Flipper'], :configuration => 'Debug' + pod 'FlipperKit/SKIOSNetworkPlugin', versions['Flipper'], :configuration => 'Debug' + pod 'FlipperKit/FlipperKitUserDefaultsPlugin', versions['Flipper'], :configuration => 'Debug' + pod 'FlipperKit/FlipperKitReactPlugin', versions['Flipper'], :configuration => 'Debug' + + # List all transitive dependencies for FlipperKit pods + # to avoid them being linked in Release builds + pod 'Flipper', versions['Flipper'], :configuration => 'Debug' + pod 'Flipper-DoubleConversion', versions['DoubleConversion'], :configuration => 'Debug' + pod 'Flipper-Folly', versions['Flipper-Folly'], :configuration => 'Debug' + pod 'Flipper-Glog', versions['Flipper-Glog'], :configuration => 'Debug' + pod 'Flipper-PeerTalk', versions['Flipper-PeerTalk'], :configuration => 'Debug' + pod 'Flipper-RSocket', versions['Flipper-RSocket'], :configuration => 'Debug' + pod 'FlipperKit/Core', versions['Flipper'], :configuration => 'Debug' + pod 'FlipperKit/CppBridge', versions['Flipper'], :configuration => 'Debug' + pod 'FlipperKit/FBCxxFollyDynamicConvert', versions['Flipper'], :configuration => 'Debug' + pod 'FlipperKit/FBDefines', versions['Flipper'], :configuration => 'Debug' + pod 'FlipperKit/FKPortForwarding', versions['Flipper'], :configuration => 'Debug' + pod 'FlipperKit/FlipperKitHighlightOverlay', versions['Flipper'], :configuration => 'Debug' + pod 'FlipperKit/FlipperKitLayoutTextSearchable', versions['Flipper'], :configuration => 'Debug' + pod 'FlipperKit/FlipperKitNetworkPlugin', versions['Flipper'], :configuration => 'Debug' end # Post Install processing for Flipper diff --git a/react-native/ReactNativeFlipperExample/ios/Podfile.lock b/react-native/ReactNativeFlipperExample/ios/Podfile.lock index ee8158d6f..e2ff536d3 100644 --- a/react-native/ReactNativeFlipperExample/ios/Podfile.lock +++ b/react-native/ReactNativeFlipperExample/ios/Podfile.lock @@ -11,11 +11,11 @@ PODS: - React-Core (= 0.62.0-rc.5) - React-jsi (= 0.62.0-rc.5) - ReactCommon/turbomodule/core (= 0.62.0-rc.5) - - Flipper (0.33.1): - - Flipper-Folly (~> 2.1) - - Flipper-RSocket (~> 1.0) + - Flipper (0.44.0): + - Flipper-Folly (~> 2.2) + - Flipper-RSocket (~> 1.1) - Flipper-DoubleConversion (1.1.7) - - Flipper-Folly (2.1.1): + - Flipper-Folly (2.2.0): - boost-for-react-native - CocoaLibEvent (~> 1.0) - Flipper-DoubleConversion @@ -23,38 +23,38 @@ PODS: - OpenSSL-Universal (= 1.0.2.19) - Flipper-Glog (0.3.6) - Flipper-PeerTalk (0.0.4) - - Flipper-RSocket (1.0.0): - - Flipper-Folly (~> 2.0) - - FlipperKit (0.33.1): - - FlipperKit/Core (= 0.33.1) - - FlipperKit/Core (0.33.1): - - Flipper (~> 0.33.1) + - Flipper-RSocket (1.1.0): + - Flipper-Folly (~> 2.2) + - FlipperKit (0.44.0): + - FlipperKit/Core (= 0.44.0) + - FlipperKit/Core (0.44.0): + - Flipper (~> 0.44.0) - FlipperKit/CppBridge - FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBDefines - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.33.1): - - Flipper (~> 0.33.1) - - FlipperKit/FBCxxFollyDynamicConvert (0.33.1): - - Flipper-Folly (~> 2.1) - - FlipperKit/FBDefines (0.33.1) - - FlipperKit/FKPortForwarding (0.33.1): + - FlipperKit/CppBridge (0.44.0): + - Flipper (~> 0.44.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.44.0): + - Flipper-Folly (~> 2.2) + - FlipperKit/FBDefines (0.44.0) + - FlipperKit/FKPortForwarding (0.44.0): - CocoaAsyncSocket (~> 7.6) - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.33.1) - - FlipperKit/FlipperKitLayoutPlugin (0.33.1): + - FlipperKit/FlipperKitHighlightOverlay (0.44.0) + - FlipperKit/FlipperKitLayoutPlugin (0.44.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutTextSearchable - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.33.1) - - FlipperKit/FlipperKitNetworkPlugin (0.33.1): + - FlipperKit/FlipperKitLayoutTextSearchable (0.44.0) + - FlipperKit/FlipperKitNetworkPlugin (0.44.0): - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.33.1): + - FlipperKit/FlipperKitReactPlugin (0.44.0): - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.33.1): + - FlipperKit/FlipperKitUserDefaultsPlugin (0.44.0): - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.33.1): + - FlipperKit/SKIOSNetworkPlugin (0.44.0): - FlipperKit/Core - FlipperKit/FlipperKitNetworkPlugin - Folly (2018.10.22.00): @@ -233,7 +233,7 @@ PODS: - React-cxxreact (= 0.62.0-rc.5) - React-jsi (= 0.62.0-rc.5) - React-jsinspector (0.62.0-rc.5) - - react-native-flipper (0.36.0): + - react-native-flipper (0.44.0): - React - React-RCTActionSheet (0.62.0-rc.5): - React-Core/RCTActionSheetHeaders (= 0.62.0-rc.5) @@ -302,11 +302,25 @@ DEPENDENCIES: - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`) - - FlipperKit (~> 0.33.1) - - FlipperKit/FlipperKitLayoutPlugin (~> 0.33.1) - - FlipperKit/FlipperKitReactPlugin (~> 0.33.1) - - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.33.1) - - FlipperKit/SKIOSNetworkPlugin (~> 0.33.1) + - Flipper (~> 0.44.0) + - Flipper-DoubleConversion (= 1.1.7) + - Flipper-Folly (~> 2.1) + - Flipper-Glog (= 0.3.6) + - Flipper-PeerTalk (~> 0.0.4) + - Flipper-RSocket (~> 1.0) + - FlipperKit (~> 0.44.0) + - FlipperKit/Core (~> 0.44.0) + - FlipperKit/CppBridge (~> 0.44.0) + - FlipperKit/FBCxxFollyDynamicConvert (~> 0.44.0) + - FlipperKit/FBDefines (~> 0.44.0) + - FlipperKit/FKPortForwarding (~> 0.44.0) + - FlipperKit/FlipperKitHighlightOverlay (~> 0.44.0) + - FlipperKit/FlipperKitLayoutPlugin (~> 0.44.0) + - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.44.0) + - FlipperKit/FlipperKitNetworkPlugin (~> 0.44.0) + - FlipperKit/FlipperKitReactPlugin (~> 0.44.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.44.0) + - FlipperKit/SKIOSNetworkPlugin (~> 0.44.0) - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) @@ -410,13 +424,13 @@ SPEC CHECKSUMS: DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 FBLazyVector: a9acf3fc9058f0a06ff8ff40d876025cf89fc326 FBReactNativeSpec: ca7ec9c06345f5ba53118dd22db915486f27d0f7 - Flipper: 6c1f484f9a88d30ab3e272800d53688439e50f69 + Flipper: 15358e30892853cda6807b923261d18ad948c70f Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 - Flipper-Folly: 2de3d03e0acc7064d5e4ed9f730e2f217486f162 + Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3 Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - Flipper-RSocket: 1260a31c05c238eabfa9bb8a64e3983049048371 - FlipperKit: 6dc9b8f4ef60d9e5ded7f0264db299c91f18832e + Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7 + FlipperKit: 99967705f93f246c1b3dc6fb17378c49630c70b1 Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 @@ -429,7 +443,7 @@ SPEC CHECKSUMS: React-jsi: 6eb628cbb8b427609cc7867da5c390b57284fb88 React-jsiexecutor: 7f96dd5e1264c67b2143e73af54f86abda99cde6 React-jsinspector: a3017d13fbcb7f4c42dcbcd415b97135ac3f0f41 - react-native-flipper: adfd8c60f693b84567611332c1ee1418041d0b90 + react-native-flipper: 353081574a4f6e8f7c2715ff0dd7b0f166a5d87d React-RCTActionSheet: f4c23f31ca9a1f85a734ce18a31de1dfd0054ddb React-RCTAnimation: 8e7f07139ce580b939700ba4af8f8daa0da8884c React-RCTBlob: 449577dc262e0fa7455fac8468d9b64fb9a9d919 @@ -443,6 +457,6 @@ SPEC CHECKSUMS: Yoga: e0448a3eecac22245fae6ce1b291c557b93b06af YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 2713ada0e70d2c3c07fb81ca9f8eebbb58b21528 +PODFILE CHECKSUM: ec00bac18470bff6bf1d2db889337b72b34a474a -COCOAPODS: 1.8.4 +COCOAPODS: 1.9.2 diff --git a/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample.xcodeproj/project.pbxproj b/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample.xcodeproj/project.pbxproj index a960b1665..46db4fd18 100644 --- a/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample.xcodeproj/project.pbxproj +++ b/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample.xcodeproj/project.pbxproj @@ -161,7 +161,6 @@ B58A6DC1259804C4C7AB6C4F /* Pods-ReactNativeFlipperExample-tvOSTests.debug.xcconfig */, 99EF6E868FCCD2A7D2595783 /* Pods-ReactNativeFlipperExample-tvOSTests.release.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -636,6 +635,7 @@ "FB_SONARKIT_ENABLED=1", ); INFOPLIST_FILE = ReactNativeFlipperExample/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = ( "$(inherited)", @@ -658,6 +658,7 @@ CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 1; INFOPLIST_FILE = ReactNativeFlipperExample/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = ( "$(inherited)",