2020-01-02 23:49:45 +03:00
|
|
|
platform :ios, '10.0'
|
2019-06-21 13:04:31 +03:00
|
|
|
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
|
2019-03-22 13:26:05 +03:00
|
|
|
|
2019-12-06 22:08:02 +03:00
|
|
|
# Add Flipper Pods
|
2019-09-04 02:19:55 +03:00
|
|
|
def flipper_pods()
|
2019-12-06 22:08:02 +03:00
|
|
|
flipperkit_version = '0.30.0'
|
2019-09-04 02:19:55 +03:00
|
|
|
pod 'FlipperKit', '~>' + flipperkit_version, :configuration => 'Debug'
|
|
|
|
pod 'FlipperKit/FlipperKitLayoutPlugin', '~>' + flipperkit_version, :configuration => 'Debug'
|
|
|
|
pod 'FlipperKit/SKIOSNetworkPlugin', '~>' + flipperkit_version, :configuration => 'Debug'
|
|
|
|
pod 'FlipperKit/FlipperKitUserDefaultsPlugin', '~>' + flipperkit_version, :configuration => 'Debug'
|
2019-09-07 05:38:16 +03:00
|
|
|
pod 'FlipperKit/FlipperKitReactPlugin', '~>' + flipperkit_version, :configuration => 'Debug'
|
2019-09-04 02:19:55 +03:00
|
|
|
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
|
|
|
|
file_name = Dir.glob("*.xcodeproj")[0]
|
|
|
|
app_project = Xcodeproj::Project.open(file_name)
|
|
|
|
app_project.native_targets.each do |target|
|
|
|
|
target.build_configurations.each do |config|
|
|
|
|
cflags = config.build_settings['OTHER_CFLAGS'] || '$(inherited) '
|
|
|
|
unless cflags.include? '-DFB_SONARKIT_ENABLED=1'
|
|
|
|
puts 'Adding -DFB_SONARKIT_ENABLED=1 in OTHER_CFLAGS...'
|
|
|
|
cflags << '-DFB_SONARKIT_ENABLED=1'
|
|
|
|
end
|
|
|
|
config.build_settings['OTHER_CFLAGS'] = cflags
|
|
|
|
end
|
|
|
|
app_project.save
|
|
|
|
end
|
|
|
|
installer.pods_project.save
|
|
|
|
end
|
|
|
|
|
|
|
|
|
2019-03-22 13:26:05 +03:00
|
|
|
target 'HelloWorld' do
|
|
|
|
# Pods for HelloWorld
|
2019-07-04 21:17:06 +03:00
|
|
|
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"
|
2019-07-13 00:24:55 +03:00
|
|
|
pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety"
|
2019-03-22 13:26:05 +03:00
|
|
|
pod 'React', :path => '../node_modules/react-native/'
|
CocoaPods frameworks compatibility: Step 2 (#25619)
Summary:
This is my proposal for fixing `use_frameworks!` compatibility without breaking all `<React/*>` imports I outlined in https://github.com/facebook/react-native/pull/25393#issuecomment-508457700. If accepted, it will fix https://github.com/facebook/react-native/issues/25349.
It builds on the changes I made in https://github.com/facebook/react-native/pull/25496 by ensuring each podspec has a unique value for `header_dir` so that framework imports do not conflict. Every podspec which should be included in the `<React/*>` namespace now includes it's headers from `React-Core.podspec`.
The following pods can still be imported with `<React/*>` and so should not have breaking changes: `React-ART`,`React-DevSupport`, `React-CoreModules`, `React-RCTActionSheet`, `React-RCTAnimation`, `React-RCTBlob`, `React-RCTImage`, `React-RCTLinking`, `React-RCTNetwork`, `React-RCTPushNotification`, `React-RCTSettings`, `React-RCTText`, `React-RCTSettings`, `React-RCTVibration`, `React-RCTWebSocket` .
There are still a few breaking changes which I hope will be acceptable:
- `React-Core.podspec` has been moved to the root of the project. Any `Podfile` that references it will need to update the path.
- ~~`React-turbomodule-core`'s headers now live under `<turbomodule/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823.
- ~~`React-turbomodulesamples`'s headers now live under `<turbomodulesamples/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823.
- ~~`React-TypeSaferty`'s headers now live under `<TypeSafety/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511040967.
- ~~`React-jscallinvoker`'s headers now live under `<jscallinvoker/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823.
- Each podspec now uses `s.static_framework = true`. This means that a minimum of CocoaPods 1.5 ([released in April 2018](http://blog.cocoapods.org/CocoaPods-1.5.0/)) is now required. This is needed so that the ` __has_include` conditions can still work when frameworks are enabled.
Still to do:
- ~~Including `React-turbomodule-core` with `use_frameworks!` enabled causes the C++ import failures we saw in https://github.com/facebook/react-native/issues/25349. I'm sure it will be possible to fix this but I need to dig deeper (perhaps a custom modulemap would be needed).~~ Addressed by https://github.com/facebook/react-native/pull/25619/commits/33573511f02f3502a28bad48e085e9a4b8608302.
- I haven't got Fabric working yet. I wonder if it would be acceptable to move Fabric out of the `<React/*>` namespace since it is new? �
## Changelog
[iOS] [Fixed] - Fixed compatibility with CocoaPods frameworks.
Pull Request resolved: https://github.com/facebook/react-native/pull/25619
Test Plan:
### FB
```
buck build catalyst
```
### Sample Project
Everything should work exactly as before, where `use_frameworks!` is not in `Podfile`s. I have a branch on my [sample project](https://github.com/jtreanor/react-native-cocoapods-frameworks) here which has `use_frameworks!` in its `Podfile` to demonstrate this is fixed.
You can see that it works with these steps:
1. `git clone git@github.com:jtreanor/react-native-cocoapods-frameworks.git`
2. `git checkout fix-frameworks-subspecs`
3. `cd ios && pod install`
4. `cd .. && react-native run-ios`
The sample app will build and run successfully. To see that it still works without frameworks, remove `use_frameworks!` from the `Podfile` and do steps 3 and 4 again.
### RNTesterPods
`RNTesterPodsPods` can now work with or without `use_frameworks!`.
1. Go to the `RNTester` directory and run `pod install`.
2. Run the tests in `RNTesterPods.xcworkspace` to see that everything still works fine.
3. Uncomment the `use_frameworks!` line at the top of `RNTester/Podfile` and run `pod install` again.
4. Run the tests again and see that it still works with frameworks enabled.
Reviewed By: PeteTheHeat
Differential Revision: D16465247
Pulled By: PeteTheHeat
fbshipit-source-id: cad837e9cced06d30cc5b372af1c65c7780b9e7a
2019-07-25 08:26:42 +03:00
|
|
|
pod 'React-Core', :path => '../node_modules/react-native/'
|
2019-07-04 21:17:06 +03:00
|
|
|
pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
|
2019-07-25 21:42:49 +03:00
|
|
|
pod 'React-Core/DevSupport', :path => '../node_modules/react-native/'
|
2019-03-22 13:26:05 +03:00
|
|
|
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'
|
2019-07-25 21:42:49 +03:00
|
|
|
pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/'
|
2019-03-22 13:26:05 +03:00
|
|
|
|
|
|
|
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'
|
2019-09-20 20:48:50 +03:00
|
|
|
pod 'ReactCommon/callinvoker', :path => "../node_modules/react-native/ReactCommon"
|
2019-07-13 08:34:14 +03:00
|
|
|
pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon"
|
2019-12-06 22:08:02 +03:00
|
|
|
pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga', :modular_headers => true
|
2019-03-22 13:26:05 +03:00
|
|
|
|
|
|
|
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'
|
|
|
|
|
|
|
|
target 'HelloWorldTests' do
|
2019-09-04 02:19:55 +03:00
|
|
|
inherit! :complete
|
2019-03-22 13:26:05 +03:00
|
|
|
# Pods for testing
|
|
|
|
end
|
2019-04-24 16:13:20 +03:00
|
|
|
|
2019-06-21 13:04:31 +03:00
|
|
|
use_native_modules!
|
2019-09-04 02:19:55 +03:00
|
|
|
|
|
|
|
# For enabling Flipper.
|
2019-12-13 01:52:14 +03:00
|
|
|
# Note that if you have use_frameworks!, flipper will not work.
|
|
|
|
# Disable these lines if you are using use_frameworks!
|
2019-09-04 02:19:55 +03:00
|
|
|
flipper_pods()
|
|
|
|
post_install do |installer|
|
|
|
|
flipper_post_install(installer)
|
|
|
|
end
|
2019-03-22 13:26:05 +03:00
|
|
|
end
|
|
|
|
|
|
|
|
target 'HelloWorld-tvOS' do
|
|
|
|
# Pods for HelloWorld-tvOS
|
|
|
|
|
|
|
|
target 'HelloWorld-tvOSTests' do
|
|
|
|
inherit! :search_paths
|
|
|
|
# Pods for testing
|
|
|
|
end
|
|
|
|
end
|