From 697962359ce0760db00875237b2e75d23503fe82 Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Thu, 7 Feb 2019 12:03:04 -0800 Subject: [PATCH] Fixed the build issue for oss Summary: Our OSS build was failing with the latest version of cocoapods(1.6.0). The reason was that the `post_install` script of adding a `SWIFT_VERSION` was not getting applied while building the project. So I added a `swift_version` in the YogaKit pod itself. So with this change we no longer need the `post_install` script to add `SWIFT_VERSION`. I have also released a new version of YogaKit(1.10.0) on the CocoaPods. Usually the swift pods should specify the swift_version which is being used to develop it.Due to unknown reason, it was never mentioned in the podspec. Reviewed By: jknoxville Differential Revision: D13990363 fbshipit-source-id: 3c2f814765c03683fbedd17b3607ff0e6cdef566 --- iOS/FlipperKit.podspec | 2 +- iOS/Sample/Podfile | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/iOS/FlipperKit.podspec b/iOS/FlipperKit.podspec index 9d18a4f89..d81692e9a 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.9' -yogakit_version = '~>1.8' +yogakit_version = '~>1.10' flipperkit_version = '0.15.0' Pod::Spec.new do |spec| spec.name = 'FlipperKit' diff --git a/iOS/Sample/Podfile b/iOS/Sample/Podfile index 4e84f3a0c..7016e5191 100644 --- a/iOS/Sample/Podfile +++ b/iOS/Sample/Podfile @@ -14,13 +14,6 @@ target 'Sample' do # 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| - installer.pods_project.targets.each do |target| - if ['YogaKit'].include? target.name - target.build_configurations.each do |config| - config.build_settings['SWIFT_VERSION'] = swift_version - end - end - end file_name = Dir.glob("*.xcodeproj")[0] app_project = Xcodeproj::Project.open(file_name) app_project.native_targets.each do |target|