Skip to content

Commit

Permalink
chore: remove Flipper integration
Browse files Browse the repository at this point in the history
  • Loading branch information
szymonrybczak committed Dec 12, 2023
1 parent da301c3 commit 5b92921
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 129 deletions.
2 changes: 0 additions & 2 deletions packages/TesterApp/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,6 @@ dependencies {
// The version of react-native is set by the React Native Gradle Plugin
implementation("com.facebook.react:react-android")

implementation("com.facebook.react:flipper-integration")

if (hermesEnabled.toBoolean()) {
implementation("com.facebook.react:hermes-android")
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import com.facebook.react.ReactPackage
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
import com.facebook.react.defaults.DefaultReactNativeHost
import com.facebook.react.flipper.ReactNativeFlipper
import com.facebook.soloader.SoLoader

class MainApplication : Application(), ReactApplication {
Expand Down Expand Up @@ -40,6 +39,5 @@ class MainApplication : Application(), ReactApplication {
// If you opted-in for the New Architecture, we load the native entry point for this app.
load()
}
ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager)
}
}
15 changes: 0 additions & 15 deletions packages/TesterApp/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,6 @@ require Pod::Executable.execute_command('node', ['-p',
platform :ios, min_ios_version_supported
prepare_react_native_project!

# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
# because `react-native-flipper` depends on (FlipperKit,...) that will be excluded
#
# To fix this you can also exclude `react-native-flipper` using a `react-native.config.js`
# ```js
# module.exports = {
# dependencies: {
# ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
# ```
flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
linkage = ENV['USE_FRAMEWORKS']
if linkage != nil
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
Expand All @@ -30,11 +20,6 @@ target 'TesterApp' do
use_react_native!(
:path => config[:reactNativePath],

# Enables Flipper.
#
# Note that if you have use_frameworks! enabled, Flipper will not work and
# you should disable the next line.
:flipper_configuration => flipper_config,
# An absolute path to your application root.
:app_path => "#{Pod::Config.instance.installation_root}/.."
)
Expand Down
106 changes: 3 additions & 103 deletions packages/TesterApp/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ PODS:
- JWTDecode (~> 3.0.0)
- React-Core
- SwiftyRSA (~> 1.7)
- CocoaAsyncSocket (7.6.5)
- DoubleConversion (1.1.6)
- FBLazyVector (0.73.0)
- FBReactNativeSpec (0.73.0):
Expand All @@ -14,70 +13,13 @@ PODS:
- React-Core (= 0.73.0)
- React-jsi (= 0.73.0)
- ReactCommon/turbomodule/core (= 0.73.0)
- Flipper (0.201.0):
- Flipper-Folly (~> 2.6)
- Flipper-Boost-iOSX (1.76.0.1.11)
- Flipper-DoubleConversion (3.2.0.1)
- Flipper-Fmt (7.1.7)
- Flipper-Folly (2.6.10):
- Flipper-Boost-iOSX
- Flipper-DoubleConversion
- Flipper-Fmt (= 7.1.7)
- Flipper-Glog
- libevent (~> 2.1.12)
- OpenSSL-Universal (= 1.1.1100)
- Flipper-Glog (0.5.0.5)
- Flipper-PeerTalk (0.0.4)
- FlipperKit (0.201.0):
- FlipperKit/Core (= 0.201.0)
- FlipperKit/Core (0.201.0):
- Flipper (~> 0.201.0)
- FlipperKit/CppBridge
- FlipperKit/FBCxxFollyDynamicConvert
- FlipperKit/FBDefines
- FlipperKit/FKPortForwarding
- SocketRocket (~> 0.6.0)
- FlipperKit/CppBridge (0.201.0):
- Flipper (~> 0.201.0)
- FlipperKit/FBCxxFollyDynamicConvert (0.201.0):
- Flipper-Folly (~> 2.6)
- FlipperKit/FBDefines (0.201.0)
- FlipperKit/FKPortForwarding (0.201.0):
- CocoaAsyncSocket (~> 7.6)
- Flipper-PeerTalk (~> 0.0.4)
- FlipperKit/FlipperKitHighlightOverlay (0.201.0)
- FlipperKit/FlipperKitLayoutHelpers (0.201.0):
- FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutTextSearchable
- FlipperKit/FlipperKitLayoutIOSDescriptors (0.201.0):
- FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutHelpers
- FlipperKit/FlipperKitLayoutPlugin (0.201.0):
- FlipperKit/Core
- FlipperKit/FlipperKitHighlightOverlay
- FlipperKit/FlipperKitLayoutHelpers
- FlipperKit/FlipperKitLayoutIOSDescriptors
- FlipperKit/FlipperKitLayoutTextSearchable
- FlipperKit/FlipperKitLayoutTextSearchable (0.201.0)
- FlipperKit/FlipperKitNetworkPlugin (0.201.0):
- FlipperKit/Core
- FlipperKit/FlipperKitReactPlugin (0.201.0):
- FlipperKit/Core
- FlipperKit/FlipperKitUserDefaultsPlugin (0.201.0):
- FlipperKit/Core
- FlipperKit/SKIOSNetworkPlugin (0.201.0):
- FlipperKit/Core
- FlipperKit/FlipperKitNetworkPlugin
- fmt (6.2.1)
- glog (0.3.5)
- hermes-engine (0.73.0):
- hermes-engine/Pre-built (= 0.73.0)
- hermes-engine/Pre-built (0.73.0)
- JWTDecode (3.0.1)
- libevent (2.1.12)
- OpenSSL-Universal (1.1.1100)
- RCT-Folly (2022.05.16.00):
- boost
- DoubleConversion
Expand Down Expand Up @@ -1116,7 +1058,7 @@ PODS:
- React-jsi (= 0.73.0)
- React-logger (= 0.73.0)
- React-perflogger (= 0.73.0)
- RNCAsyncStorage (1.17.11):
- RNCAsyncStorage (1.21.0):
- React-Core
- RNSVG (13.8.0):
- React-Core
Expand All @@ -1132,30 +1074,9 @@ 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/React/FBReactNativeSpec`)
- Flipper (= 0.201.0)
- Flipper-Boost-iOSX (= 1.76.0.1.11)
- Flipper-DoubleConversion (= 3.2.0.1)
- Flipper-Fmt (= 7.1.7)
- Flipper-Folly (= 2.6.10)
- Flipper-Glog (= 0.5.0.5)
- Flipper-PeerTalk (= 0.0.4)
- FlipperKit (= 0.201.0)
- FlipperKit/Core (= 0.201.0)
- FlipperKit/CppBridge (= 0.201.0)
- FlipperKit/FBCxxFollyDynamicConvert (= 0.201.0)
- FlipperKit/FBDefines (= 0.201.0)
- FlipperKit/FKPortForwarding (= 0.201.0)
- FlipperKit/FlipperKitHighlightOverlay (= 0.201.0)
- FlipperKit/FlipperKitLayoutPlugin (= 0.201.0)
- FlipperKit/FlipperKitLayoutTextSearchable (= 0.201.0)
- FlipperKit/FlipperKitNetworkPlugin (= 0.201.0)
- FlipperKit/FlipperKitReactPlugin (= 0.201.0)
- FlipperKit/FlipperKitUserDefaultsPlugin (= 0.201.0)
- FlipperKit/SKIOSNetworkPlugin (= 0.201.0)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
- libevent (~> 2.1.12)
- OpenSSL-Universal (= 1.1.1100)
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
- RCT-Folly/Fabric (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
Expand All @@ -1164,7 +1085,6 @@ DEPENDENCIES:
- React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
- React-Codegen (from `build/generated/ios`)
- React-Core (from `../node_modules/react-native/`)
- React-Core/DevSupport (from `../node_modules/react-native/`)
- React-Core/RCTWebSocket (from `../node_modules/react-native/`)
- React-CoreModules (from `../node_modules/react-native/React/CoreModules`)
- React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`)
Expand Down Expand Up @@ -1206,19 +1126,9 @@ DEPENDENCIES:

SPEC REPOS:
trunk:
- CocoaAsyncSocket
- Flipper
- Flipper-Boost-iOSX
- Flipper-DoubleConversion
- Flipper-Fmt
- Flipper-Folly
- Flipper-Glog
- Flipper-PeerTalk
- FlipperKit
- fmt
- JWTDecode
- libevent
- OpenSSL-Universal
- SocketRocket
- SwiftyRSA

Expand Down Expand Up @@ -1330,24 +1240,14 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
boost: 26fad476bfa736552bbfa698a06cc530475c1505
callstack-repack: 5ae2a87e5cf204ef1ac6d111c71bb948fc1f5b4e
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
FBLazyVector: 39ba45baf4e398618f8b3a4bb6ba8fcdb7fc2133
FBReactNativeSpec: 20cfca68498e27879514790359289d1df2b52c56
Flipper: c7a0093234c4bdd456e363f2f19b2e4b27652d44
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3
Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
FlipperKit: 37525a5d056ef9b93d1578e04bc3ea1de940094f
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
hermes-engine: 34304f8c6e8fa68f63a5fe29af82f227d817d7a7
JWTDecode: 2eed97c2fa46ccaf3049a787004eedf0be474a87
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0
RCTRequired: 5e3631b27c08716986980ef23eed8abdee1cdcaf
RCTTypeSafety: 02a64828b0b428eb4f63de1397d44fb2d0747e85
Expand Down Expand Up @@ -1389,12 +1289,12 @@ SPEC CHECKSUMS:
React-runtimescheduler: 77543c74df984ce56c09d49d427149c53784aaf6
React-utils: 42708ea436853045ef1eaff29996813d9fbbe209
ReactCommon: 851280fb976399ca1aabc74cc2c3612069ea70a2
RNCAsyncStorage: 8616bd5a58af409453ea4e1b246521bb76578d60
RNCAsyncStorage: 618d03a5f52fbccb3d7010076bc54712844c18ef
RNSVG: c1e76b81c76cdcd34b4e1188852892dc280eb902
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
SwiftyRSA: 8c6dd1ea7db1b8dc4fb517a202f88bb1354bc2c6
Yoga: 20d6a900dcc8d61d5e3b799bbf627cc34474a8c4

PODFILE CHECKSUM: 10205d1b1118b1d8e010708e96ceba52779160a0
PODFILE CHECKSUM: bfe91a981d64614a20d26a8cf583bc804942b7d0

COCOAPODS: 1.14.2
2 changes: 1 addition & 1 deletion packages/TesterApp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"dependencies": {
"@callstack/repack": "3.6.0",
"@react-native-async-storage/async-storage": "^1.17.11",
"@react-native-async-storage/async-storage": "^1.21.0",
"lodash.throttle": "^4.1.1",
"react": "18.2.0",
"react-native": "0.73.0",
Expand Down
12 changes: 6 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7972,14 +7972,14 @@ __metadata:
languageName: node
linkType: hard

"@react-native-async-storage/async-storage@npm:^1.17.11":
version: 1.17.11
resolution: "@react-native-async-storage/async-storage@npm:1.17.11"
"@react-native-async-storage/async-storage@npm:^1.21.0":
version: 1.21.0
resolution: "@react-native-async-storage/async-storage@npm:1.21.0"
dependencies:
merge-options: ^3.0.4
peerDependencies:
react-native: ^0.0.0-0 || 0.60 - 0.71 || 1000.0.0
checksum: 691f2b74498160d0b532f673402d8affeecb28b005b1c6d6fa2e7c87f89ab3068177e8e2d2686738306e7592a39c6d7148aa4c426b7e8e149c43a336ad446648
react-native: ^0.0.0-0 || >=0.60 <1.0
checksum: 969cdeb444a037087b1897553082e148e25c8331055dd0dc142f76deeb4aadd9ed5ec26926ae990b3e9ff088396e74ab557148a2dd2a7db86058051b774f2619
languageName: node
linkType: hard

Expand Down Expand Up @@ -32345,7 +32345,7 @@ __metadata:
"@babel/runtime": ^7.20.0
"@callstack/eslint-config": ^12.0.2
"@callstack/repack": 3.6.0
"@react-native-async-storage/async-storage": ^1.17.11
"@react-native-async-storage/async-storage": ^1.21.0
"@react-native/babel-preset": ^0.73.18
"@react-native/eslint-config": ^0.73.1
"@react-native/typescript-config": ^0.73.1
Expand Down

0 comments on commit 5b92921

Please sign in to comment.