diff --git a/react-native/ReactNativeFlipperExample/android/app/build.gradle b/react-native/ReactNativeFlipperExample/android/app/build.gradle index f49984808..1144b737e 100644 --- a/react-native/ReactNativeFlipperExample/android/app/build.gradle +++ b/react-native/ReactNativeFlipperExample/android/app/build.gradle @@ -171,13 +171,6 @@ android { } } - packagingOptions { - pickFirst "lib/armeabi-v7a/libc++_shared.so" - pickFirst "lib/arm64-v8a/libc++_shared.so" - pickFirst "lib/x86/libc++_shared.so" - pickFirst "lib/x86_64/libc++_shared.so" - } - // applicationVariants are e.g. debug, release applicationVariants.all { variant -> variant.outputs.each { output -> diff --git a/react-native/ReactNativeFlipperExample/android/build.gradle b/react-native/ReactNativeFlipperExample/android/build.gradle index e924c102d..30e0d25fc 100644 --- a/react-native/ReactNativeFlipperExample/android/build.gradle +++ b/react-native/ReactNativeFlipperExample/android/build.gradle @@ -9,17 +9,17 @@ buildscript { ext { - buildToolsVersion = "28.0.3" + buildToolsVersion = "29.0.2" minSdkVersion = 16 - compileSdkVersion = 28 - targetSdkVersion = 28 + compileSdkVersion = 29 + targetSdkVersion = 29 } repositories { google() jcenter() } dependencies { - classpath("com.android.tools.build:gradle:3.5.2") + classpath("com.android.tools.build:gradle:3.5.3") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/react-native/ReactNativeFlipperExample/android/gradle.properties b/react-native/ReactNativeFlipperExample/android/gradle.properties index b32539bfa..5cb982194 100644 --- a/react-native/ReactNativeFlipperExample/android/gradle.properties +++ b/react-native/ReactNativeFlipperExample/android/gradle.properties @@ -30,4 +30,4 @@ android.useAndroidX=true android.enableJetifier=true # Version of flipper SDK to use with React Native -FLIPPER_VERSION=0.49.0 +FLIPPER_VERSION=0.69.0 diff --git a/react-native/ReactNativeFlipperExample/android/gradle/wrapper/gradle-wrapper.properties b/react-native/ReactNativeFlipperExample/android/gradle/wrapper/gradle-wrapper.properties index 1ba7206f8..842267020 100644 --- a/react-native/ReactNativeFlipperExample/android/gradle/wrapper/gradle-wrapper.properties +++ b/react-native/ReactNativeFlipperExample/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/react-native/ReactNativeFlipperExample/android/gradlew b/react-native/ReactNativeFlipperExample/android/gradlew index 83f2acfdc..2fe81a7d9 100755 --- a/react-native/ReactNativeFlipperExample/android/gradlew +++ b/react-native/ReactNativeFlipperExample/android/gradlew @@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -175,14 +175,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/react-native/ReactNativeFlipperExample/android/gradlew.bat b/react-native/ReactNativeFlipperExample/android/gradlew.bat index 24467a141..9109989e3 100644 --- a/react-native/ReactNativeFlipperExample/android/gradlew.bat +++ b/react-native/ReactNativeFlipperExample/android/gradlew.bat @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" diff --git a/react-native/ReactNativeFlipperExample/ios/Podfile b/react-native/ReactNativeFlipperExample/ios/Podfile index 53d6c1c29..e5f5203f4 100644 --- a/react-native/ReactNativeFlipperExample/ios/Podfile +++ b/react-native/ReactNativeFlipperExample/ios/Podfile @@ -1,94 +1,22 @@ -platform :ios, '11.0' +require_relative '../node_modules/react-native/scripts/react_native_pods' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' -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 -def flipper_post_install(installer) - installer.pods_project.targets.each do |target| - if target.name == 'YogaKit' - target.build_configurations.each do |config| - config.build_settings['SWIFT_VERSION'] = '4.1' - end - end - end -end +platform :ios, '10.0' target 'ReactNativeFlipperExample' do - # Pods for ReactNativeFlipperExample - pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector" - pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec" - pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired" - pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety" - pod 'React', :path => '../node_modules/react-native/' - pod 'React-Core', :path => '../node_modules/react-native/' - pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules' - pod 'React-Core/DevSupport', :path => '../node_modules/react-native/' - pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS' - pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation' - pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob' - pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image' - pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS' - pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network' - pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings' - pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text' - pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration' - pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/' - - pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact' - pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi' - pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor' - pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector' - pod 'ReactCommon/callinvoker', :path => "../node_modules/react-native/ReactCommon" - pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon" - pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga', :modular_headers => true - - pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec' - pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec' - pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec' + config = use_native_modules! + use_react_native!(:path => config["reactNativePath"]) target 'ReactNativeFlipperExampleTests' do inherit! :complete # Pods for testing end - use_native_modules! - # Enables Flipper. # # Note that if you have use_frameworks! enabled, Flipper will not work and # you should disable these next few lines. - add_flipper_pods! + use_flipper! post_install do |installer| flipper_post_install(installer) end diff --git a/react-native/ReactNativeFlipperExample/ios/Podfile.lock b/react-native/ReactNativeFlipperExample/ios/Podfile.lock index 527ef55a2..42634bbfe 100644 --- a/react-native/ReactNativeFlipperExample/ios/Podfile.lock +++ b/react-native/ReactNativeFlipperExample/ios/Podfile.lock @@ -1,299 +1,303 @@ PODS: - boost-for-react-native (1.63.0) - - CocoaAsyncSocket (7.6.4) + - CocoaAsyncSocket (7.6.5) - CocoaLibEvent (1.0.0) - DoubleConversion (1.1.6) - - FBLazyVector (0.62.0-rc.5) - - FBReactNativeSpec (0.62.0-rc.5): - - Folly (= 2018.10.22.00) - - RCTRequired (= 0.62.0-rc.5) - - RCTTypeSafety (= 0.62.0-rc.5) - - React-Core (= 0.62.0-rc.5) - - React-jsi (= 0.62.0-rc.5) - - ReactCommon/turbomodule/core (= 0.62.0-rc.5) - - Flipper (0.44.0): + - FBLazyVector (0.63.4) + - FBReactNativeSpec (0.63.4): + - Folly (= 2020.01.13.00) + - RCTRequired (= 0.63.4) + - RCTTypeSafety (= 0.63.4) + - React-Core (= 0.63.4) + - React-jsi (= 0.63.4) + - ReactCommon/turbomodule/core (= 0.63.4) + - Flipper (0.54.0): - Flipper-Folly (~> 2.2) - Flipper-RSocket (~> 1.1) - Flipper-DoubleConversion (1.1.7) - - Flipper-Folly (2.2.0): + - Flipper-Folly (2.3.0): - boost-for-react-native - CocoaLibEvent (~> 1.0) - Flipper-DoubleConversion - Flipper-Glog - - OpenSSL-Universal (= 1.0.2.19) + - OpenSSL-Universal (= 1.0.2.20) - Flipper-Glog (0.3.6) - Flipper-PeerTalk (0.0.4) - 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 (0.54.0): + - FlipperKit/Core (= 0.54.0) + - FlipperKit/Core (0.54.0): + - Flipper (~> 0.54.0) - FlipperKit/CppBridge - FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBDefines - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.44.0): - - Flipper (~> 0.44.0) - - FlipperKit/FBCxxFollyDynamicConvert (0.44.0): + - FlipperKit/CppBridge (0.54.0): + - Flipper (~> 0.54.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.54.0): - Flipper-Folly (~> 2.2) - - FlipperKit/FBDefines (0.44.0) - - FlipperKit/FKPortForwarding (0.44.0): + - FlipperKit/FBDefines (0.54.0) + - FlipperKit/FKPortForwarding (0.54.0): - CocoaAsyncSocket (~> 7.6) - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.44.0) - - FlipperKit/FlipperKitLayoutPlugin (0.44.0): + - FlipperKit/FlipperKitHighlightOverlay (0.54.0) + - FlipperKit/FlipperKitLayoutPlugin (0.54.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutTextSearchable - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.44.0) - - FlipperKit/FlipperKitNetworkPlugin (0.44.0): + - FlipperKit/FlipperKitLayoutTextSearchable (0.54.0) + - FlipperKit/FlipperKitNetworkPlugin (0.54.0): - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.44.0): + - FlipperKit/FlipperKitReactPlugin (0.54.0): - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.44.0): + - FlipperKit/FlipperKitUserDefaultsPlugin (0.54.0): - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.44.0): + - FlipperKit/SKIOSNetworkPlugin (0.54.0): - FlipperKit/Core - FlipperKit/FlipperKitNetworkPlugin - - Folly (2018.10.22.00): + - Folly (2020.01.13.00): - boost-for-react-native - DoubleConversion - - Folly/Default (= 2018.10.22.00) + - Folly/Default (= 2020.01.13.00) - glog - - Folly/Default (2018.10.22.00): + - Folly/Default (2020.01.13.00): - boost-for-react-native - DoubleConversion - glog - glog (0.3.5) - - OpenSSL-Universal (1.0.2.19): - - OpenSSL-Universal/Static (= 1.0.2.19) - - OpenSSL-Universal/Static (1.0.2.19) - - RCTRequired (0.62.0-rc.5) - - RCTTypeSafety (0.62.0-rc.5): - - FBLazyVector (= 0.62.0-rc.5) - - Folly (= 2018.10.22.00) - - RCTRequired (= 0.62.0-rc.5) - - React-Core (= 0.62.0-rc.5) - - React (0.62.0-rc.5): - - React-Core (= 0.62.0-rc.5) - - React-Core/DevSupport (= 0.62.0-rc.5) - - React-Core/RCTWebSocket (= 0.62.0-rc.5) - - React-RCTActionSheet (= 0.62.0-rc.5) - - React-RCTAnimation (= 0.62.0-rc.5) - - React-RCTBlob (= 0.62.0-rc.5) - - React-RCTImage (= 0.62.0-rc.5) - - React-RCTLinking (= 0.62.0-rc.5) - - React-RCTNetwork (= 0.62.0-rc.5) - - React-RCTSettings (= 0.62.0-rc.5) - - React-RCTText (= 0.62.0-rc.5) - - React-RCTVibration (= 0.62.0-rc.5) - - React-Core (0.62.0-rc.5): - - Folly (= 2018.10.22.00) + - OpenSSL-Universal (1.0.2.20): + - OpenSSL-Universal/Static (= 1.0.2.20) + - OpenSSL-Universal/Static (1.0.2.20) + - RCTRequired (0.63.4) + - RCTTypeSafety (0.63.4): + - FBLazyVector (= 0.63.4) + - Folly (= 2020.01.13.00) + - RCTRequired (= 0.63.4) + - React-Core (= 0.63.4) + - React (0.63.4): + - React-Core (= 0.63.4) + - React-Core/DevSupport (= 0.63.4) + - React-Core/RCTWebSocket (= 0.63.4) + - React-RCTActionSheet (= 0.63.4) + - React-RCTAnimation (= 0.63.4) + - React-RCTBlob (= 0.63.4) + - React-RCTImage (= 0.63.4) + - React-RCTLinking (= 0.63.4) + - React-RCTNetwork (= 0.63.4) + - React-RCTSettings (= 0.63.4) + - React-RCTText (= 0.63.4) + - React-RCTVibration (= 0.63.4) + - React-callinvoker (0.63.4) + - React-Core (0.63.4): + - Folly (= 2020.01.13.00) - glog - - React-Core/Default (= 0.62.0-rc.5) - - React-cxxreact (= 0.62.0-rc.5) - - React-jsi (= 0.62.0-rc.5) - - React-jsiexecutor (= 0.62.0-rc.5) + - React-Core/Default (= 0.63.4) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/CoreModulesHeaders (0.62.0-rc.5): - - Folly (= 2018.10.22.00) + - React-Core/CoreModulesHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0-rc.5) - - React-jsi (= 0.62.0-rc.5) - - React-jsiexecutor (= 0.62.0-rc.5) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/Default (0.62.0-rc.5): - - Folly (= 2018.10.22.00) + - React-Core/Default (0.63.4): + - Folly (= 2020.01.13.00) - glog - - React-cxxreact (= 0.62.0-rc.5) - - React-jsi (= 0.62.0-rc.5) - - React-jsiexecutor (= 0.62.0-rc.5) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/DevSupport (0.62.0-rc.5): - - Folly (= 2018.10.22.00) + - React-Core/DevSupport (0.63.4): + - Folly (= 2020.01.13.00) - glog - - React-Core/Default (= 0.62.0-rc.5) - - React-Core/RCTWebSocket (= 0.62.0-rc.5) - - React-cxxreact (= 0.62.0-rc.5) - - React-jsi (= 0.62.0-rc.5) - - React-jsiexecutor (= 0.62.0-rc.5) - - React-jsinspector (= 0.62.0-rc.5) + - React-Core/Default (= 0.63.4) + - React-Core/RCTWebSocket (= 0.63.4) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) + - React-jsinspector (= 0.63.4) - Yoga - - React-Core/RCTActionSheetHeaders (0.62.0-rc.5): - - Folly (= 2018.10.22.00) + - React-Core/RCTActionSheetHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0-rc.5) - - React-jsi (= 0.62.0-rc.5) - - React-jsiexecutor (= 0.62.0-rc.5) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/RCTAnimationHeaders (0.62.0-rc.5): - - Folly (= 2018.10.22.00) + - React-Core/RCTAnimationHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0-rc.5) - - React-jsi (= 0.62.0-rc.5) - - React-jsiexecutor (= 0.62.0-rc.5) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/RCTBlobHeaders (0.62.0-rc.5): - - Folly (= 2018.10.22.00) + - React-Core/RCTBlobHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0-rc.5) - - React-jsi (= 0.62.0-rc.5) - - React-jsiexecutor (= 0.62.0-rc.5) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/RCTImageHeaders (0.62.0-rc.5): - - Folly (= 2018.10.22.00) + - React-Core/RCTImageHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0-rc.5) - - React-jsi (= 0.62.0-rc.5) - - React-jsiexecutor (= 0.62.0-rc.5) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/RCTLinkingHeaders (0.62.0-rc.5): - - Folly (= 2018.10.22.00) + - React-Core/RCTLinkingHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0-rc.5) - - React-jsi (= 0.62.0-rc.5) - - React-jsiexecutor (= 0.62.0-rc.5) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/RCTNetworkHeaders (0.62.0-rc.5): - - Folly (= 2018.10.22.00) + - React-Core/RCTNetworkHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0-rc.5) - - React-jsi (= 0.62.0-rc.5) - - React-jsiexecutor (= 0.62.0-rc.5) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/RCTSettingsHeaders (0.62.0-rc.5): - - Folly (= 2018.10.22.00) + - React-Core/RCTSettingsHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0-rc.5) - - React-jsi (= 0.62.0-rc.5) - - React-jsiexecutor (= 0.62.0-rc.5) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/RCTTextHeaders (0.62.0-rc.5): - - Folly (= 2018.10.22.00) + - React-Core/RCTTextHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0-rc.5) - - React-jsi (= 0.62.0-rc.5) - - React-jsiexecutor (= 0.62.0-rc.5) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/RCTVibrationHeaders (0.62.0-rc.5): - - Folly (= 2018.10.22.00) + - React-Core/RCTVibrationHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.0-rc.5) - - React-jsi (= 0.62.0-rc.5) - - React-jsiexecutor (= 0.62.0-rc.5) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/RCTWebSocket (0.62.0-rc.5): - - Folly (= 2018.10.22.00) + - React-Core/RCTWebSocket (0.63.4): + - Folly (= 2020.01.13.00) - glog - - React-Core/Default (= 0.62.0-rc.5) - - React-cxxreact (= 0.62.0-rc.5) - - React-jsi (= 0.62.0-rc.5) - - React-jsiexecutor (= 0.62.0-rc.5) + - React-Core/Default (= 0.63.4) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-CoreModules (0.62.0-rc.5): - - FBReactNativeSpec (= 0.62.0-rc.5) - - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.0-rc.5) - - React-Core/CoreModulesHeaders (= 0.62.0-rc.5) - - React-RCTImage (= 0.62.0-rc.5) - - ReactCommon/turbomodule/core (= 0.62.0-rc.5) - - React-cxxreact (0.62.0-rc.5): + - React-CoreModules (0.63.4): + - FBReactNativeSpec (= 0.63.4) + - Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.4) + - React-Core/CoreModulesHeaders (= 0.63.4) + - React-jsi (= 0.63.4) + - React-RCTImage (= 0.63.4) + - ReactCommon/turbomodule/core (= 0.63.4) + - React-cxxreact (0.63.4): - boost-for-react-native (= 1.63.0) - DoubleConversion - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - - React-jsinspector (= 0.62.0-rc.5) - - React-jsi (0.62.0-rc.5): + - React-callinvoker (= 0.63.4) + - React-jsinspector (= 0.63.4) + - React-jsi (0.63.4): - boost-for-react-native (= 1.63.0) - DoubleConversion - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - - React-jsi/Default (= 0.62.0-rc.5) - - React-jsi/Default (0.62.0-rc.5): + - React-jsi/Default (= 0.63.4) + - React-jsi/Default (0.63.4): - boost-for-react-native (= 1.63.0) - DoubleConversion - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - - React-jsiexecutor (0.62.0-rc.5): + - React-jsiexecutor (0.63.4): - DoubleConversion - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - - 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.45.0): + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsinspector (0.63.4) + - react-native-flipper (0.69.0): - React - - React-RCTActionSheet (0.62.0-rc.5): - - React-Core/RCTActionSheetHeaders (= 0.62.0-rc.5) - - React-RCTAnimation (0.62.0-rc.5): - - FBReactNativeSpec (= 0.62.0-rc.5) - - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.0-rc.5) - - React-Core/RCTAnimationHeaders (= 0.62.0-rc.5) - - ReactCommon/turbomodule/core (= 0.62.0-rc.5) - - React-RCTBlob (0.62.0-rc.5): - - FBReactNativeSpec (= 0.62.0-rc.5) - - Folly (= 2018.10.22.00) - - React-Core/RCTBlobHeaders (= 0.62.0-rc.5) - - React-Core/RCTWebSocket (= 0.62.0-rc.5) - - React-jsi (= 0.62.0-rc.5) - - React-RCTNetwork (= 0.62.0-rc.5) - - ReactCommon/turbomodule/core (= 0.62.0-rc.5) - - React-RCTImage (0.62.0-rc.5): - - FBReactNativeSpec (= 0.62.0-rc.5) - - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.0-rc.5) - - React-Core/RCTImageHeaders (= 0.62.0-rc.5) - - React-RCTNetwork (= 0.62.0-rc.5) - - ReactCommon/turbomodule/core (= 0.62.0-rc.5) - - React-RCTLinking (0.62.0-rc.5): - - FBReactNativeSpec (= 0.62.0-rc.5) - - React-Core/RCTLinkingHeaders (= 0.62.0-rc.5) - - ReactCommon/turbomodule/core (= 0.62.0-rc.5) - - React-RCTNetwork (0.62.0-rc.5): - - FBReactNativeSpec (= 0.62.0-rc.5) - - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.0-rc.5) - - React-Core/RCTNetworkHeaders (= 0.62.0-rc.5) - - ReactCommon/turbomodule/core (= 0.62.0-rc.5) - - React-RCTSettings (0.62.0-rc.5): - - FBReactNativeSpec (= 0.62.0-rc.5) - - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.0-rc.5) - - React-Core/RCTSettingsHeaders (= 0.62.0-rc.5) - - ReactCommon/turbomodule/core (= 0.62.0-rc.5) - - React-RCTText (0.62.0-rc.5): - - React-Core/RCTTextHeaders (= 0.62.0-rc.5) - - React-RCTVibration (0.62.0-rc.5): - - FBReactNativeSpec (= 0.62.0-rc.5) - - Folly (= 2018.10.22.00) - - React-Core/RCTVibrationHeaders (= 0.62.0-rc.5) - - ReactCommon/turbomodule/core (= 0.62.0-rc.5) - - ReactCommon/callinvoker (0.62.0-rc.5): + - React-RCTActionSheet (0.63.4): + - React-Core/RCTActionSheetHeaders (= 0.63.4) + - React-RCTAnimation (0.63.4): + - FBReactNativeSpec (= 0.63.4) + - Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.4) + - React-Core/RCTAnimationHeaders (= 0.63.4) + - React-jsi (= 0.63.4) + - ReactCommon/turbomodule/core (= 0.63.4) + - React-RCTBlob (0.63.4): + - FBReactNativeSpec (= 0.63.4) + - Folly (= 2020.01.13.00) + - React-Core/RCTBlobHeaders (= 0.63.4) + - React-Core/RCTWebSocket (= 0.63.4) + - React-jsi (= 0.63.4) + - React-RCTNetwork (= 0.63.4) + - ReactCommon/turbomodule/core (= 0.63.4) + - React-RCTImage (0.63.4): + - FBReactNativeSpec (= 0.63.4) + - Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.4) + - React-Core/RCTImageHeaders (= 0.63.4) + - React-jsi (= 0.63.4) + - React-RCTNetwork (= 0.63.4) + - ReactCommon/turbomodule/core (= 0.63.4) + - React-RCTLinking (0.63.4): + - FBReactNativeSpec (= 0.63.4) + - React-Core/RCTLinkingHeaders (= 0.63.4) + - React-jsi (= 0.63.4) + - ReactCommon/turbomodule/core (= 0.63.4) + - React-RCTNetwork (0.63.4): + - FBReactNativeSpec (= 0.63.4) + - Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.4) + - React-Core/RCTNetworkHeaders (= 0.63.4) + - React-jsi (= 0.63.4) + - ReactCommon/turbomodule/core (= 0.63.4) + - React-RCTSettings (0.63.4): + - FBReactNativeSpec (= 0.63.4) + - Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.4) + - React-Core/RCTSettingsHeaders (= 0.63.4) + - React-jsi (= 0.63.4) + - ReactCommon/turbomodule/core (= 0.63.4) + - React-RCTText (0.63.4): + - React-Core/RCTTextHeaders (= 0.63.4) + - React-RCTVibration (0.63.4): + - FBReactNativeSpec (= 0.63.4) + - Folly (= 2020.01.13.00) + - React-Core/RCTVibrationHeaders (= 0.63.4) + - React-jsi (= 0.63.4) + - ReactCommon/turbomodule/core (= 0.63.4) + - ReactCommon/turbomodule/core (0.63.4): - DoubleConversion - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - - React-cxxreact (= 0.62.0-rc.5) - - ReactCommon/turbomodule/core (0.62.0-rc.5): - - DoubleConversion - - Folly (= 2018.10.22.00) - - glog - - React-Core (= 0.62.0-rc.5) - - React-cxxreact (= 0.62.0-rc.5) - - React-jsi (= 0.62.0-rc.5) - - ReactCommon/callinvoker (= 0.62.0-rc.5) + - React-callinvoker (= 0.63.4) + - React-Core (= 0.63.4) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) - Yoga (1.14.0) - YogaKit (1.18.1): - Yoga (~> 1.14) @@ -302,30 +306,31 @@ 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`) - - Flipper (~> 0.44.0) + - Flipper (~> 0.54.0) - Flipper-DoubleConversion (= 1.1.7) - - Flipper-Folly (~> 2.1) + - Flipper-Folly (~> 2.2) - 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) + - Flipper-RSocket (~> 1.1) + - FlipperKit (~> 0.54.0) + - FlipperKit/Core (~> 0.54.0) + - FlipperKit/CppBridge (~> 0.54.0) + - FlipperKit/FBCxxFollyDynamicConvert (~> 0.54.0) + - FlipperKit/FBDefines (~> 0.54.0) + - FlipperKit/FKPortForwarding (~> 0.54.0) + - FlipperKit/FlipperKitHighlightOverlay (~> 0.54.0) + - FlipperKit/FlipperKitLayoutPlugin (~> 0.54.0) + - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.54.0) + - FlipperKit/FlipperKitNetworkPlugin (~> 0.54.0) + - FlipperKit/FlipperKitReactPlugin (~> 0.54.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.54.0) + - FlipperKit/SKIOSNetworkPlugin (~> 0.54.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`) - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) - React (from `../node_modules/react-native/`) + - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`) - React-Core (from `../node_modules/react-native/`) - React-Core/DevSupport (from `../node_modules/react-native/`) - React-Core/RCTWebSocket (from `../node_modules/react-native/`) @@ -344,7 +349,6 @@ DEPENDENCIES: - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`) - React-RCTText (from `../node_modules/react-native/Libraries/Text`) - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) - - ReactCommon/callinvoker (from `../node_modules/react-native/ReactCommon`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) @@ -380,6 +384,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/Libraries/TypeSafety" React: :path: "../node_modules/react-native/" + React-callinvoker: + :path: "../node_modules/react-native/ReactCommon/callinvoker" React-Core: :path: "../node_modules/react-native/" React-CoreModules: @@ -419,44 +425,45 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c - CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845 + CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f - DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 - FBLazyVector: a9acf3fc9058f0a06ff8ff40d876025cf89fc326 - FBReactNativeSpec: ca7ec9c06345f5ba53118dd22db915486f27d0f7 - Flipper: 15358e30892853cda6807b923261d18ad948c70f + DoubleConversion: cde416483dac037923206447da6e1454df403714 + FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e + FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e + Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 - Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3 + Flipper-Folly: e4493b013c02d9347d5e0cb4d128680239f6c78a Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7 - FlipperKit: 99967705f93f246c1b3dc6fb17378c49630c70b1 - Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 - glog: 1f3da668190260b06b429bb211bfbee5cd790c28 - OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 - RCTRequired: 8f1dd8582716f10ba3763029a8313146df2ae8de - RCTTypeSafety: 0fba7626dcbaccf374f72bc3249e8e64396ad536 - React: 9f449f4b3748d56ec37c936e6b2f43230d5a9fe7 - React-Core: 28a580f7e9a692c24bde0b96c3edf926f7108fe8 - React-CoreModules: 9be7515a0b6039b3d0907910e0b5f4dca6d78dc6 - React-cxxreact: a660513eb5a780094bb0f0e6240e38e7895fd2a1 - React-jsi: 6eb628cbb8b427609cc7867da5c390b57284fb88 - React-jsiexecutor: 7f96dd5e1264c67b2143e73af54f86abda99cde6 - React-jsinspector: a3017d13fbcb7f4c42dcbcd415b97135ac3f0f41 - react-native-flipper: bc9162dfd46c95bbe032e62e162ae936bfafd94b - React-RCTActionSheet: f4c23f31ca9a1f85a734ce18a31de1dfd0054ddb - React-RCTAnimation: 8e7f07139ce580b939700ba4af8f8daa0da8884c - React-RCTBlob: 449577dc262e0fa7455fac8468d9b64fb9a9d919 - React-RCTImage: a19d9fcb4986097bd58b4b0e4b9134576bb6d1c0 - React-RCTLinking: 21825311f405295951afd10f09e276d177f8403a - React-RCTNetwork: 51feac57b893e94ee85fb46870b6bef7c4b58145 - React-RCTSettings: 81676b6e50109cd96db42ac8117c32716e01ab10 - React-RCTText: 3bd3aabfefc2317e48cc9fd5eac2023f9b9a4456 - React-RCTVibration: 892e403408a4cd8471071d0f447db73be21e05ab - ReactCommon: da01dd55154d473c5c0538d64ff91ebacdd1f7ee - Yoga: e0448a3eecac22245fae6ce1b291c557b93b06af + FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d + Folly: b73c3869541e86821df3c387eb0af5f65addfab4 + glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3 + OpenSSL-Universal: ff34003318d5e1163e9529b08470708e389ffcdd + RCTRequired: 082f10cd3f905d6c124597fd1c14f6f2655ff65e + RCTTypeSafety: 8c9c544ecbf20337d069e4ae7fd9a377aadf504b + React: b0a957a2c44da4113b0c4c9853d8387f8e64e615 + React-callinvoker: c3f44dd3cb195b6aa46621fff95ded79d59043fe + React-Core: d3b2a1ac9a2c13c3bcde712d9281fc1c8a5b315b + React-CoreModules: 0581ff36cb797da0943d424f69e7098e43e9be60 + React-cxxreact: c1480d4fda5720086c90df537ee7d285d4c57ac3 + React-jsi: a0418934cf48f25b485631deb27c64dc40fb4c31 + React-jsiexecutor: 93bd528844ad21dc07aab1c67cb10abae6df6949 + React-jsinspector: 58aef7155bc9a9683f5b60b35eccea8722a4f53a + react-native-flipper: 9d5738fbde235d9e2c922783e0e4657e665fe8ab + React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336 + React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b + React-RCTBlob: a97d378b527740cc667e03ebfa183a75231ab0f0 + React-RCTImage: c1b1f2d3f43a4a528c8946d6092384b5c880d2f0 + React-RCTLinking: 35ae4ab9dc0410d1fcbdce4d7623194a27214fb2 + React-RCTNetwork: 29ec2696f8d8cfff7331fac83d3e893c95ef43ae + React-RCTSettings: 60f0691bba2074ef394f95d4c2265ec284e0a46a + React-RCTText: 5c51df3f08cb9dedc6e790161195d12bac06101c + React-RCTVibration: ae4f914cfe8de7d4de95ae1ea6cc8f6315d73d9d + ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b + Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: f9f57fc88aa93cb64e0b46441cad586698bdfbef +PODFILE CHECKSUM: 958c5ee86eb13a9a91dd4121b8e4df7e41a7d591 -COCOAPODS: 1.9.1 +COCOAPODS: 1.9.3 diff --git a/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample.xcodeproj/project.pbxproj b/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample.xcodeproj/project.pbxproj index 1dd537998..4519c2e86 100644 --- a/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample.xcodeproj/project.pbxproj +++ b/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample.xcodeproj/project.pbxproj @@ -208,6 +208,7 @@ 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, + 4B4AFCCBB0879333439F0C1B /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -229,6 +230,7 @@ 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, + FC3B49C295CE038DA736697B /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -410,6 +412,24 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + 4B4AFCCBB0879333439F0C1B /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-ReactNativeFlipperExample-ReactNativeFlipperExampleTests/Pods-ReactNativeFlipperExample-ReactNativeFlipperExampleTests-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", + ); + name = "[CP] Copy Pods Resources"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ReactNativeFlipperExample-ReactNativeFlipperExampleTests/Pods-ReactNativeFlipperExample-ReactNativeFlipperExampleTests-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; A6CBA30D2571EA0A4774400E /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -476,6 +496,24 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + FC3B49C295CE038DA736697B /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-ReactNativeFlipperExample/Pods-ReactNativeFlipperExample-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", + ); + name = "[CP] Copy Pods Resources"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ReactNativeFlipperExample/Pods-ReactNativeFlipperExample-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; FD10A7F022414F080027D42C /* Start Packager */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample/AppDelegate.m b/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample/AppDelegate.m index c02a27b8d..2f58762a2 100644 --- a/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample/AppDelegate.m +++ b/react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample/AppDelegate.m @@ -11,7 +11,7 @@ #import #import -#if DEBUG +#ifdef FB_SONARKIT_ENABLED #import #import #import @@ -38,7 +38,7 @@ static void InitializeFlipper(UIApplication* application) { - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions { -#if DEBUG +#ifdef FB_SONARKIT_ENABLED InitializeFlipper(application); #endif diff --git a/react-native/ReactNativeFlipperExample/package.json b/react-native/ReactNativeFlipperExample/package.json index f42248d72..1e90c34b1 100644 --- a/react-native/ReactNativeFlipperExample/package.json +++ b/react-native/ReactNativeFlipperExample/package.json @@ -6,7 +6,7 @@ "android": "relative-deps && react-native run-android", "ios": "relative-deps && react-native run-ios", "start": "relative-deps && react-native start", - "prepare": "relative-deps", + "prepare": "relative-deps && cd android && ./gradlew clean && cd ../ios && pod install", "test": "jest" }, "dependencies": {