From 3d66b1c9d0e22c544b9fe3a521347afc6cdded6d Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Fri, 3 Aug 2018 07:07:33 -0700 Subject: [PATCH] Fix for iOS Cocoapods default config (#205) Summary: Solves #203 - [x] Sample Objc and Swift apps now have default configs(i.e non-recursive header search paths) - [x] Fix for the cocoapods default config by adding FBMacros.h file in `Core` subspec - [x] Updated the Spec(0.6.15) so that 0.6.15 works for default configs - [x] Updated the doc Pull Request resolved: https://github.com/facebook/flipper/pull/205 Reviewed By: passy Differential Revision: D9148358 Pulled By: priteshrnandgaonkar fbshipit-source-id: e6d32d9cde7b100573bd9a9996f0ec850b269d28 --- Specs/SonarKit/0.6.15/SonarKit.podspec | 2 +- docs/getting-started.md | 2 +- iOS/Sample/Sample.xcodeproj/project.pbxproj | 8 ++++---- iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj | 4 ++-- iOS/SonarKit.podspec | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Specs/SonarKit/0.6.15/SonarKit.podspec b/Specs/SonarKit/0.6.15/SonarKit.podspec index 89d52d196..d9d66242c 100644 --- a/Specs/SonarKit/0.6.15/SonarKit.podspec +++ b/Specs/SonarKit/0.6.15/SonarKit.podspec @@ -57,7 +57,7 @@ Pod::Spec.new do |spec| ss.dependency 'OpenSSL-Static', '1.0.2.c1' ss.compiler_flags = folly_compiler_flags ss.source_files = 'iOS/SonarKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/SonarKit/CppBridge/*.{h,mm}', 'iOS/SonarKit/FBCxxUtils/*.{h,mm}', 'iOS/SonarKit/Utilities/**/*.{h,m}', 'iOS/SonarKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/SonarKit/**/{SonarClient,SonarPlugin,SonarConnection,SonarResponder,SKMacros}.h' + ss.public_header_files = 'iOS/FBDefines/FBMacros.h', 'iOS/SonarKit/**/{SonarClient,SonarPlugin,SonarConnection,SonarResponder,SKMacros}.h' header_search_paths = "\"$(PODS_ROOT)/SonarKit/iOS/SonarKit\" \"$(PODS_ROOT)\"/Headers/Private/SonarKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", "DEFINES_MODULE" => "YES", diff --git a/docs/getting-started.md b/docs/getting-started.md index 937e36744..8a53aa6de 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -71,7 +71,7 @@ source 'https://github.com/facebook/Sonar.git' source 'https://github.com/CocoaPods/Specs' # Uncomment the next line to define a global platform for your project swift_version = "4.1" -sonarkit_version = '0.6.14' +sonarkit_version = '0.6.15' target 'MyApp' do diff --git a/iOS/Sample/Sample.xcodeproj/project.pbxproj b/iOS/Sample/Sample.xcodeproj/project.pbxproj index 8e2287d2e..b44e11a9a 100644 --- a/iOS/Sample/Sample.xcodeproj/project.pbxproj +++ b/iOS/Sample/Sample.xcodeproj/project.pbxproj @@ -335,11 +335,11 @@ "\"${PODS_ROOT}/Headers/Public/DoubleConversion\"", "\"${PODS_ROOT}/Headers/Public/Folly\"", "\"${PODS_ROOT}/Headers/Public/PeerTalk\"", - "\"${PODS_ROOT}/Headers/Public/Sonar\"/**", + "\"${PODS_ROOT}/Headers/Public/Sonar\"", "\"${PODS_ROOT}/Headers/Public/SonarKit\"", "\"${PODS_ROOT}/Headers/Public/Yoga\"", "\"${PODS_ROOT}/Headers/Public/boost-for-react-native\"", - "\"${PODS_ROOT}/Headers/Public/glog\"/**", + "\"${PODS_ROOT}/Headers/Public/glog\"", ); INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 11.3; @@ -399,11 +399,11 @@ "\"${PODS_ROOT}/Headers/Public/DoubleConversion\"", "\"${PODS_ROOT}/Headers/Public/Folly\"", "\"${PODS_ROOT}/Headers/Public/PeerTalk\"", - "\"${PODS_ROOT}/Headers/Public/Sonar\"/**", + "\"${PODS_ROOT}/Headers/Public/Sonar\"", "\"${PODS_ROOT}/Headers/Public/SonarKit\"", "\"${PODS_ROOT}/Headers/Public/Yoga\"", "\"${PODS_ROOT}/Headers/Public/boost-for-react-native\"", - "\"${PODS_ROOT}/Headers/Public/glog\"/**", + "\"${PODS_ROOT}/Headers/Public/glog\"", ); INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 11.3; diff --git a/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj b/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj index f2cba01fc..4a35f2f09 100644 --- a/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj +++ b/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj @@ -332,7 +332,7 @@ "\"${PODS_ROOT}/Headers/Public/PeerTalk\"", "\"${PODS_ROOT}/Headers/Public/RSocket\"", "\"${PODS_ROOT}/Headers/Public/Sonar\"", - "\"${PODS_ROOT}/Headers/Public/SonarKit\"/**", + "\"${PODS_ROOT}/Headers/Public/SonarKit\"", "\"${PODS_ROOT}/Headers/Public/Yoga\"", "\"${PODS_ROOT}/Headers/Public/glog\"", ); @@ -366,7 +366,7 @@ "\"${PODS_ROOT}/Headers/Public/PeerTalk\"", "\"${PODS_ROOT}/Headers/Public/RSocket\"", "\"${PODS_ROOT}/Headers/Public/Sonar\"", - "\"${PODS_ROOT}/Headers/Public/SonarKit\"/**", + "\"${PODS_ROOT}/Headers/Public/SonarKit\"", "\"${PODS_ROOT}/Headers/Public/Yoga\"", "\"${PODS_ROOT}/Headers/Public/glog\"", ); diff --git a/iOS/SonarKit.podspec b/iOS/SonarKit.podspec index 89d52d196..d9d66242c 100644 --- a/iOS/SonarKit.podspec +++ b/iOS/SonarKit.podspec @@ -57,7 +57,7 @@ Pod::Spec.new do |spec| ss.dependency 'OpenSSL-Static', '1.0.2.c1' ss.compiler_flags = folly_compiler_flags ss.source_files = 'iOS/SonarKit/FBDefines/*.{h,cpp,m,mm}', 'iOS/SonarKit/CppBridge/*.{h,mm}', 'iOS/SonarKit/FBCxxUtils/*.{h,mm}', 'iOS/SonarKit/Utilities/**/*.{h,m}', 'iOS/SonarKit/*.{h,m,mm}' - ss.public_header_files = 'iOS/SonarKit/**/{SonarClient,SonarPlugin,SonarConnection,SonarResponder,SKMacros}.h' + ss.public_header_files = 'iOS/FBDefines/FBMacros.h', 'iOS/SonarKit/**/{SonarClient,SonarPlugin,SonarConnection,SonarResponder,SKMacros}.h' header_search_paths = "\"$(PODS_ROOT)/SonarKit/iOS/SonarKit\" \"$(PODS_ROOT)\"/Headers/Private/SonarKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", "DEFINES_MODULE" => "YES",