Skip to content
This repository has been archived by the owner on Nov 22, 2024. It is now read-only.

Commit

Permalink
[CocoaPods] Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@alloy
alloy committed May 1, 2020
1 parent bb18e58 commit de75701
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 61 deletions.
28 changes: 15 additions & 13 deletions docs/getting-started/ios-native.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ target 'MyApp' do

# It is likely that you'll only want to include Flipper in debug builds,
# in which case you add the `:configuration` directive:
pod 'FlipperKit', '~>' + flipperkit_version, :configuration => [:debug]
pod 'FlipperKit/FlipperKitLayoutComponentKitSupport', '~>' + flipperkit_version, :configuration => [:debug]
pod 'FlipperKit/SKIOSNetworkPlugin', '~>' + flipperkit_version, :configuration => [:debug]
pod 'FlipperKit/FlipperKitUserDefaultsPlugin', '~>' + flipperkit_version, :configuration => [:debug]
pod 'FlipperKit', '~>' + flipperkit_version, :configuration => 'Debug'
pod 'FlipperKit/FlipperKitLayoutComponentKitSupport', '~>' + flipperkit_version, :configuration => 'Debug'
pod 'FlipperKit/SKIOSNetworkPlugin', '~>' + flipperkit_version, :configuration => 'Debug'
pod 'FlipperKit/FlipperKitUserDefaultsPlugin', '~>' + flipperkit_version, :configuration => 'Debug'
# ...unfortunately at this time that means you'll need to explicitly mark
# transitive dependencies as being for debug build only as well:
pod 'Flipper-DoubleConversion', :configuration => [:debug]
pod 'Flipper-Folly', :configuration => [:debug]
pod 'Flipper-Glog', :configuration => [:debug]
pod 'Flipper-PeerTalk', :configuration => [:debug]
pod 'CocoaLibEvent', :configuration => [:debug]
pod 'boost-for-react-native', :configuration => [:debug]
pod 'OpenSSL-Universal', :configuration => [:debug]
pod 'CocoaAsyncSocket', :configuration => [:debug]
pod 'Flipper-DoubleConversion', :configuration => 'Debug'
pod 'Flipper-Folly', :configuration => 'Debug'
pod 'Flipper-Glog', :configuration => 'Debug'
pod 'Flipper-PeerTalk', :configuration => 'Debug'
pod 'CocoaLibEvent', :configuration => 'Debug'
pod 'boost-for-react-native', :configuration => 'Debug'
pod 'OpenSSL-Universal', :configuration => 'Debug'
pod 'CocoaAsyncSocket', :configuration => 'Debug'
# ...except, of course, those transitive dependencies that your
# application itself depends, e.g.:
pod 'ComponentKit', '~> 0.30'
Expand All @@ -43,7 +43,9 @@ target 'MyApp' do
# it's dependencies to be built as a static library and all other pods to
# be dynamic.
#
# NOTE
# NOTE Doing this may lead to a broken build if any of these are also
# transitive dependencies of other dependencies and are expected
# to be built as frameworks.
#
# $static_framework = ['FlipperKit', 'Flipper', 'Flipper-Folly',
# 'CocoaAsyncSocket', 'ComponentKit', 'Flipper-DoubleConversion',
Expand Down
62 changes: 16 additions & 46 deletions iOS/Sample/Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,51 +5,21 @@ source 'https://cdn.cocoapods.org'
target 'Sample' do
platform :ios, '9.0'

pod 'FlipperKit', :path => '../../FlipperKit.podspec', :configuration => [:debug]
pod 'FlipperKit/FlipperKitLayoutComponentKitSupport', :path => '../../FlipperKit.podspec', :configuration => [:debug]
pod 'FlipperKit/SKIOSNetworkPlugin', :path => '../../FlipperKit.podspec', :configuration => [:debug]
pod 'FlipperKit/FlipperKitUserDefaultsPlugin', :path => '../../FlipperKit.podspec', :configuration => [:debug]
pod 'FlipperKit/FlipperKitExamplePlugin', :path => '../../FlipperKit.podspec', :configuration => [:debug]
pod 'FlipperKit/FlipperKitReactPlugin', :path => '../../FlipperKit.podspec', :configuration => [:debug]
pod 'Flipper', :path => '../../Flipper.podspec', :configuration => [:debug]

# It is likely that you'll only want to include Flipper in debug builds,
# unfortunately at this time that means you'll need to explicitly mark
# transitive dependencies as being for debug build only as well.
pod 'Flipper-DoubleConversion', :configuration => [:debug]
pod 'Flipper-Folly', :configuration => [:debug]
pod 'Flipper-Glog', :configuration => [:debug]
pod 'Flipper-PeerTalk', :configuration => [:debug]
pod 'CocoaLibEvent', :configuration => [:debug]
pod 'boost-for-react-native', :configuration => [:debug]
pod 'OpenSSL-Universal', :configuration => [:debug]
pod 'CocoaAsyncSocket', :configuration => [:debug]
# Except, of course, those transitive dependencies that your application
# itself depends, e.g.:
# See docs/getting-started/ios-native.mdx
pod 'FlipperKit', :path => '../../FlipperKit.podspec', :configuration => 'Debug'
pod 'FlipperKit/FlipperKitLayoutComponentKitSupport', :path => '../../FlipperKit.podspec', :configuration => 'Debug'
pod 'FlipperKit/SKIOSNetworkPlugin', :path => '../../FlipperKit.podspec', :configuration => 'Debug'
pod 'FlipperKit/FlipperKitUserDefaultsPlugin', :path => '../../FlipperKit.podspec', :configuration => 'Debug'
pod 'FlipperKit/FlipperKitExamplePlugin', :path => '../../FlipperKit.podspec', :configuration => 'Debug'
pod 'FlipperKit/FlipperKitReactPlugin', :path => '../../FlipperKit.podspec', :configuration => 'Debug'
pod 'Flipper', :path => '../../Flipper.podspec', :configuration => 'Debug'
pod 'Flipper-DoubleConversion', :configuration => 'Debug'
pod 'Flipper-Folly', :configuration => 'Debug'
pod 'Flipper-Glog', :configuration => 'Debug'
pod 'Flipper-PeerTalk', :configuration => 'Debug'
pod 'CocoaLibEvent', :configuration => 'Debug'
pod 'boost-for-react-native', :configuration => 'Debug'
pod 'OpenSSL-Universal', :configuration => 'Debug'
pod 'CocoaAsyncSocket', :configuration => 'Debug'
pod 'ComponentKit', '~> 0.30'

# If you use `use_frameworks!` in your Podfile,
# uncomment the below $static_framework array and also
# the pre_install section. This will cause Flipper and
# it's dependencies to be built as a static library and all other pods to
# be dynamic.
#
# NOTE That this may break your build when also depending [transitively] on
# these dependencies and expecting them to be built as frameworks.
#
# $static_framework = ['FlipperKit', 'Flipper', 'Flipper-Folly',
# 'CocoaAsyncSocket', 'ComponentKit', 'DoubleConversion',
# 'glog', 'Flipper-PeerTalk', 'Flipper-RSocket', 'Yoga', 'YogaKit',
# 'CocoaLibEvent', 'OpenSSL-Universal', 'boost-for-react-native']
#
# pre_install do |installer|
# Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
# installer.pod_targets.each do |pod|
# if $static_framework.include?(pod.name)
# def pod.build_type;
# Pod::Target::BuildType.static_library
# end
# end
# end
# end
end
2 changes: 1 addition & 1 deletion iOS/Sample/Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,6 @@ SPEC CHECKSUMS:
Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: 50681589e4d3a2e00732a867bc76cc0a1db91489
PODFILE CHECKSUM: 8ea86658038b6aa0bb47734f6ed5ad54f56b9f08

COCOAPODS: 1.8.4
5 changes: 4 additions & 1 deletion iOS/Sample/Sample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,10 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand Down

0 comments on commit de75701

Please sign in to comment.