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

Fix for iOS Cocoapods default config (#205)

Browse Source 
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
This commit is contained in:
Pritesh Nandgaonkar
2018-08-03 07:07:33 -07:00
committed by Facebook Github Bot
parent 696c73ebc1
commit 3d66b1c9d0
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Specs/SonarKit/0.6.15/SonarKit.podspec
View File

@@ -57,7 +57,7 @@ Pod::Spec.new do |spec|
ss.dependency 'OpenSSL-Static', '1.0.2.c1' ss.dependency 'OpenSSL-Static', '1.0.2.c1'
ss.compiler_flags = folly_compiler_flags 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.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\"" 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", ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
"DEFINES_MODULE" => "YES", "DEFINES_MODULE" => "YES",

2
docs/getting-started.md
View File

@@ -71,7 +71,7 @@ source 'https://github.com/facebook/Sonar.git'
source 'https://github.com/CocoaPods/Specs' source 'https://github.com/CocoaPods/Specs'
# Uncomment the next line to define a global platform for your project # Uncomment the next line to define a global platform for your project
swift_version = "4.1" swift_version = "4.1"
sonarkit_version = '0.6.14' sonarkit_version = '0.6.15'
target 'MyApp' do target 'MyApp' do

8
iOS/Sample/Sample.xcodeproj/project.pbxproj
View File

@@ -335,11 +335,11 @@
"\"${PODS_ROOT}/Headers/Public/DoubleConversion\"", "\"${PODS_ROOT}/Headers/Public/DoubleConversion\"",
"\"${PODS_ROOT}/Headers/Public/Folly\"", "\"${PODS_ROOT}/Headers/Public/Folly\"",
"\"${PODS_ROOT}/Headers/Public/PeerTalk\"", "\"${PODS_ROOT}/Headers/Public/PeerTalk\"",
"\"${PODS_ROOT}/Headers/Public/Sonar\"/**", "\"${PODS_ROOT}/Headers/Public/Sonar\"",
"\"${PODS_ROOT}/Headers/Public/SonarKit\"", "\"${PODS_ROOT}/Headers/Public/SonarKit\"",
"\"${PODS_ROOT}/Headers/Public/Yoga\"", "\"${PODS_ROOT}/Headers/Public/Yoga\"",
"\"${PODS_ROOT}/Headers/Public/boost-for-react-native\"", "\"${PODS_ROOT}/Headers/Public/boost-for-react-native\"",
"\"${PODS_ROOT}/Headers/Public/glog\"/**", "\"${PODS_ROOT}/Headers/Public/glog\"",
); );
INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.3; IPHONEOS_DEPLOYMENT_TARGET = 11.3;
@@ -399,11 +399,11 @@
"\"${PODS_ROOT}/Headers/Public/DoubleConversion\"", "\"${PODS_ROOT}/Headers/Public/DoubleConversion\"",
"\"${PODS_ROOT}/Headers/Public/Folly\"", "\"${PODS_ROOT}/Headers/Public/Folly\"",
"\"${PODS_ROOT}/Headers/Public/PeerTalk\"", "\"${PODS_ROOT}/Headers/Public/PeerTalk\"",
"\"${PODS_ROOT}/Headers/Public/Sonar\"/**", "\"${PODS_ROOT}/Headers/Public/Sonar\"",
"\"${PODS_ROOT}/Headers/Public/SonarKit\"", "\"${PODS_ROOT}/Headers/Public/SonarKit\"",
"\"${PODS_ROOT}/Headers/Public/Yoga\"", "\"${PODS_ROOT}/Headers/Public/Yoga\"",
"\"${PODS_ROOT}/Headers/Public/boost-for-react-native\"", "\"${PODS_ROOT}/Headers/Public/boost-for-react-native\"",
"\"${PODS_ROOT}/Headers/Public/glog\"/**", "\"${PODS_ROOT}/Headers/Public/glog\"",
); );
INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.3; IPHONEOS_DEPLOYMENT_TARGET = 11.3;

4
iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj
View File

@@ -332,7 +332,7 @@
"\"${PODS_ROOT}/Headers/Public/PeerTalk\"", "\"${PODS_ROOT}/Headers/Public/PeerTalk\"",
"\"${PODS_ROOT}/Headers/Public/RSocket\"", "\"${PODS_ROOT}/Headers/Public/RSocket\"",
"\"${PODS_ROOT}/Headers/Public/Sonar\"", "\"${PODS_ROOT}/Headers/Public/Sonar\"",
"\"${PODS_ROOT}/Headers/Public/SonarKit\"/**", "\"${PODS_ROOT}/Headers/Public/SonarKit\"",
"\"${PODS_ROOT}/Headers/Public/Yoga\"", "\"${PODS_ROOT}/Headers/Public/Yoga\"",
"\"${PODS_ROOT}/Headers/Public/glog\"", "\"${PODS_ROOT}/Headers/Public/glog\"",
); );
@@ -366,7 +366,7 @@
"\"${PODS_ROOT}/Headers/Public/PeerTalk\"", "\"${PODS_ROOT}/Headers/Public/PeerTalk\"",
"\"${PODS_ROOT}/Headers/Public/RSocket\"", "\"${PODS_ROOT}/Headers/Public/RSocket\"",
"\"${PODS_ROOT}/Headers/Public/Sonar\"", "\"${PODS_ROOT}/Headers/Public/Sonar\"",
"\"${PODS_ROOT}/Headers/Public/SonarKit\"/**", "\"${PODS_ROOT}/Headers/Public/SonarKit\"",
"\"${PODS_ROOT}/Headers/Public/Yoga\"", "\"${PODS_ROOT}/Headers/Public/Yoga\"",
"\"${PODS_ROOT}/Headers/Public/glog\"", "\"${PODS_ROOT}/Headers/Public/glog\"",
); );

2
iOS/SonarKit.podspec
View File

@@ -57,7 +57,7 @@ Pod::Spec.new do |spec|
ss.dependency 'OpenSSL-Static', '1.0.2.c1' ss.dependency 'OpenSSL-Static', '1.0.2.c1'
ss.compiler_flags = folly_compiler_flags 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.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\"" 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", ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
"DEFINES_MODULE" => "YES", "DEFINES_MODULE" => "YES",