jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update CK and Yoga dependencies

Browse Source 
Summary:
Updates CK and Yoga to latest dependencies.
Also removed the code from the post_install script which changed the min ios version of the yoga dependency, its no longer required.

Reviewed By: kfirapps

Differential Revision: D15098129

fbshipit-source-id: d00938db1df59d74253ae412a4bd835a0aa286b7
This commit is contained in:
Pritesh Nandgaonkar
2019-04-26 07:07:48 -07:00
committed by Facebook Github Bot
parent 0a3805c0f4
commit 4049720759
3 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
iOS/FlipperKit.podspec
View File

@@ -1,6 +1,6 @@
folly_compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_LIBGFLAGS=0 -DFOLLY_HAVE_LIBJEMALLOC=0 -DFOLLY_HAVE_PREADV=0 -DFOLLY_HAVE_PWRITEV=0 -DFOLLY_HAVE_TFO=0 -DFOLLY_USE_SYMBOLIZER=0' folly_compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_LIBGFLAGS=0 -DFOLLY_HAVE_LIBJEMALLOC=0 -DFOLLY_HAVE_PREADV=0 -DFOLLY_HAVE_PWRITEV=0 -DFOLLY_HAVE_TFO=0 -DFOLLY_USE_SYMBOLIZER=0'
yoga_version = '~> 1.12.0-pre.1' yoga_version = '~> 1.14'
yogakit_version = '~> 1.12.0-pre.1' yogakit_version = '~> 1.14'
flipperkit_version = '0.20.0' flipperkit_version = '0.20.0'
Pod::Spec.new do |spec| Pod::Spec.new do |spec|
spec.name = 'FlipperKit' spec.name = 'FlipperKit'
@@ -116,7 +116,7 @@ Pod::Spec.new do |spec|
ss.header_dir = "FlipperKitLayoutComponentKitSupport" ss.header_dir = "FlipperKitLayoutComponentKitSupport"
ss.dependency 'FlipperKit/Core' ss.dependency 'FlipperKit/Core'
ss.dependency 'Yoga', yoga_version ss.dependency 'Yoga', yoga_version
ss.dependency 'ComponentKit', '~> 0.25' ss.dependency 'ComponentKit', '~> 0.27'
ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' ss.dependency 'FlipperKit/FlipperKitLayoutPlugin'
ss.compiler_flags = folly_compiler_flags ss.compiler_flags = folly_compiler_flags
ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' ss.dependency 'FlipperKit/FlipperKitLayoutPlugin'

8
iOS/Sample/Podfile
View File

@@ -11,18 +11,10 @@ target 'Sample' do
pod 'FlipperKit/FlipperKitUserDefaultsPlugin', :path => '../../FlipperKit.podspec' pod 'FlipperKit/FlipperKitUserDefaultsPlugin', :path => '../../FlipperKit.podspec'
pod 'FlipperKit/FlipperKitExamplePlugin', :path => '../../FlipperKit.podspec' pod 'FlipperKit/FlipperKitExamplePlugin', :path => '../../FlipperKit.podspec'
pod 'Flipper', :path => '../../Flipper.podspec' pod 'Flipper', :path => '../../Flipper.podspec'
# This post_install script adds swift version to yogakit's pod target.
# It also adds -DFB_SONARKIT_ENABLED=1 flag to OTHER_CFLAGS, necessary to build expose Flipper classes in the header files # It also adds -DFB_SONARKIT_ENABLED=1 flag to OTHER_CFLAGS, necessary to build expose Flipper classes in the header files
post_install do |installer| post_install do |installer|
file_name = Dir.glob("*.xcodeproj")[0] file_name = Dir.glob("*.xcodeproj")[0]
app_project = Xcodeproj::Project.open(file_name) app_project = Xcodeproj::Project.open(file_name)
installer.pods_project.targets.each do |target|
if ('Yoga' == target.name)
target.build_configurations.each do |config|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '8.0'
end
end
end
app_project.native_targets.each do |target| app_project.native_targets.each do |target|
target.build_configurations.each do |config| target.build_configurations.each do |config|
if (config.build_settings['OTHER_CFLAGS']) if (config.build_settings['OTHER_CFLAGS'])

7
iOS/SampleSwift/Podfile
View File

@@ -14,13 +14,6 @@ target 'SampleSwift' do
post_install do |installer| post_install do |installer|
file_name = Dir.glob("*.xcodeproj")[0] file_name = Dir.glob("*.xcodeproj")[0]
app_project = Xcodeproj::Project.open(file_name) app_project = Xcodeproj::Project.open(file_name)
installer.pods_project.targets.each do |target|
if ('Yoga' == target.name)
target.build_configurations.each do |config|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '8.0'
end
end
end
app_project.native_targets.each do |target| app_project.native_targets.each do |target|
target.build_configurations.each do |config| target.build_configurations.each do |config|
if (config.build_settings['OTHER_SWIFT_FLAGS']) if (config.build_settings['OTHER_SWIFT_FLAGS'])