diff --git a/iOS/FlipperKit.podspec b/iOS/FlipperKit.podspec index 25c2b768a..5f40e68b7 100644 --- a/iOS/FlipperKit.podspec +++ b/iOS/FlipperKit.podspec @@ -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' -yoga_version = '~> 1.12.0-pre.1' -yogakit_version = '~> 1.12.0-pre.1' +yoga_version = '~> 1.14' +yogakit_version = '~> 1.14' flipperkit_version = '0.20.0' Pod::Spec.new do |spec| spec.name = 'FlipperKit' @@ -116,7 +116,7 @@ Pod::Spec.new do |spec| ss.header_dir = "FlipperKitLayoutComponentKitSupport" ss.dependency 'FlipperKit/Core' ss.dependency 'Yoga', yoga_version - ss.dependency 'ComponentKit', '~> 0.25' + ss.dependency 'ComponentKit', '~> 0.27' ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' ss.compiler_flags = folly_compiler_flags ss.dependency 'FlipperKit/FlipperKitLayoutPlugin' diff --git a/iOS/Sample/Podfile b/iOS/Sample/Podfile index 653f753c5..af2bd4b61 100644 --- a/iOS/Sample/Podfile +++ b/iOS/Sample/Podfile @@ -11,18 +11,10 @@ target 'Sample' do pod 'FlipperKit/FlipperKitUserDefaultsPlugin', :path => '../../FlipperKit.podspec' pod 'FlipperKit/FlipperKitExamplePlugin', :path => '../../FlipperKit.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 post_install do |installer| file_name = Dir.glob("*.xcodeproj")[0] 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| target.build_configurations.each do |config| if (config.build_settings['OTHER_CFLAGS']) diff --git a/iOS/SampleSwift/Podfile b/iOS/SampleSwift/Podfile index f16a6eb19..0d87853d6 100644 --- a/iOS/SampleSwift/Podfile +++ b/iOS/SampleSwift/Podfile @@ -14,13 +14,6 @@ target 'SampleSwift' do post_install do |installer| file_name = Dir.glob("*.xcodeproj")[0] 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| target.build_configurations.each do |config| if (config.build_settings['OTHER_SWIFT_FLAGS'])