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

Removed references to local oss and libevent

Browse Source
This commit is contained in:
Pritesh Nandgaonkar
2018-06-04 14:07:55 -04:00
parent 308c101fec
commit ff2dd0b828
7 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
iOS/Sample/Podfile
View File

@@ -18,8 +18,6 @@ target 'Sample' do
pod 'SonarKit', :podspec => '../SonarKit.podspec' pod 'SonarKit', :podspec => '../SonarKit.podspec'
pod 'SonarKit/SonarKitLayoutComponentKitSupport', :podspec => '../SonarKit.podspec' pod 'SonarKit/SonarKitLayoutComponentKitSupport', :podspec => '../SonarKit.podspec'
pod 'SonarKit/SKIOSNetworkPlugin', :podspec => '../SonarKit.podspec' pod 'SonarKit/SKIOSNetworkPlugin', :podspec => '../SonarKit.podspec'
pod 'OpenSSL-Universal', '~> 1.0'
pod 'CocoaLibEvent', '~> 1.0'
post_install do |installer| post_install do |installer|
installer.pods_project.targets.each do |target| installer.pods_project.targets.each do |target|
if ['YogaKit'].include? target.name if ['YogaKit'].include? target.name

14
iOS/Sample/Podfile.lock
View File

@@ -8,8 +8,10 @@ PODS:
- EasyWSClient (1.0.0) - EasyWSClient (1.0.0)
- Folly (2018.05.28.00): - Folly (2018.05.28.00):
- boost-for-react-native - boost-for-react-native
- CocoaLibEvent (~> 1.0)
- DoubleConversion - DoubleConversion
- glog - glog
- OpenSSL-Universal (~> 1.0)
- glog (0.3.5) - glog (0.3.5)
- OpenSSL-Universal (1.0.2.13) - OpenSSL-Universal (1.0.2.13)
- PeerTalk (0.0.2) - PeerTalk (0.0.2)
@@ -64,13 +66,11 @@ PODS:
- Yoga (~> 1.8.1) - Yoga (~> 1.8.1)
DEPENDENCIES: DEPENDENCIES:
- CocoaLibEvent (~> 1.0)
- ComponentKit (from `../third-party-podspecs/ComponentKit.podspec`) - ComponentKit (from `../third-party-podspecs/ComponentKit.podspec`)
- DoubleConversion (from `../third-party-podspecs/DoubleConversion.podspec`) - DoubleConversion (from `../third-party-podspecs/DoubleConversion.podspec`)
- EasyWSClient (from `../third-party-podspecs/EasyWSClient.podspec`) - EasyWSClient (from `../third-party-podspecs/EasyWSClient.podspec`)
- Folly (from `../third-party-podspecs/Folly.podspec`) - Folly (from `../third-party-podspecs/Folly.podspec`)
- glog (from `../third-party-podspecs/glog.podspec`) - glog (from `../third-party-podspecs/glog.podspec`)
- OpenSSL-Universal (~> 1.0)
- PeerTalk (from `https://github.com/rsms/peertalk`) - PeerTalk (from `https://github.com/rsms/peertalk`)
- RSocket (from `../third-party-podspecs/RSocket.podspec`) - RSocket (from `../third-party-podspecs/RSocket.podspec`)
- Sonar (from `../../xplat/Sonar/SonarKitCPP.podspec`) - Sonar (from `../../xplat/Sonar/SonarKitCPP.podspec`)
@@ -135,16 +135,16 @@ SPEC CHECKSUMS:
ComponentKit: 7bd0ad508946aeb68dd52ed8739ced9846ff3671 ComponentKit: 7bd0ad508946aeb68dd52ed8739ced9846ff3671
DoubleConversion: 9bd61b1134a393694e95e0950c5bf3f99534817f DoubleConversion: 9bd61b1134a393694e95e0950c5bf3f99534817f
EasyWSClient: 1527dd5e0c0eb849ece3ee489ac16a0d9316f752 EasyWSClient: 1527dd5e0c0eb849ece3ee489ac16a0d9316f752
Folly: 68567e4f7b526af34b4dd801c3ff76fc13e5294c Folly: ce1c216bcb099ca6cda58fefbba02bf2e9fe0381
glog: fdb5d40eb83acd6a4d5d61d95ecc583f5970a119 glog: fdb5d40eb83acd6a4d5d61d95ecc583f5970a119
OpenSSL-Universal: 401888162f11c33ebbd46f782d9229da35c61327 OpenSSL-Universal: 401888162f11c33ebbd46f782d9229da35c61327
PeerTalk: f5389c286e4d477e59b73dfbf25c5c70a2464761 PeerTalk: f5389c286e4d477e59b73dfbf25c5c70a2464761
RSocket: 706d7fb6d83c1befe57a55edffe525891b0d0674 RSocket: 38b24504db9efbfb018a3b2b23a2d9500140a2a7
Sonar: bcfc8dd5ef1046f4a9bd5f10d66594b4df66a6c2 Sonar: 29d8fb9b010e56fa1358be996d68d4b436dd8c21
SonarKit: a63bfd64d40c8196b30d7f51ba2794e3c17c725d SonarKit: 85eb1b3ef1875279d44f73ec276e6bbef1b4fc80
Yoga: e6f1fed82138c17da5332e15e5770abf0e9cc386 Yoga: e6f1fed82138c17da5332e15e5770abf0e9cc386
YogaKit: bb90d11e297e06abef7e0cfb20e035a6bd00cdc4 YogaKit: bb90d11e297e06abef7e0cfb20e035a6bd00cdc4
PODFILE CHECKSUM: 1904a24f0191377e3743dc726e5d7e52455b7ff4 PODFILE CHECKSUM: 036ec88989af4c8db5dcfdcc2e58fa70ba4d0f22
COCOAPODS: 1.5.2 COCOAPODS: 1.5.2

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

@@ -342,7 +342,6 @@
"\"${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\"/**",
"\"${PODS_ROOT}/SonarKit\"/**", "\"${PODS_ROOT}/SonarKit\"/**",
"/usr/local/include\\ /usr/local/Cellar/openssl/1.0.2o_1/include",
); );
INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.3; IPHONEOS_DEPLOYMENT_TARGET = 11.3;
@@ -410,7 +409,6 @@
"\"${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\"/**",
"\"${PODS_ROOT}/SonarKit\"/**", "\"${PODS_ROOT}/SonarKit\"/**",
"/usr/local/include\\ /usr/local/Cellar/openssl/1.0.2o_1/include",
); );
INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.3; IPHONEOS_DEPLOYMENT_TARGET = 11.3;

2
iOS/SonarKit.podspec
View File

@@ -31,7 +31,7 @@ Pod::Spec.new do |spec|
spec.compiler_flags = '-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' spec.compiler_flags = '-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'
spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/** \"$(PODS_ROOT)/boost-for-react-native\" \"/usr/local/include\" \"/usr/local/Cellar/openssl/1.0.2o_1/include\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/ComponentKit\"/**" } "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/ComponentKit\"/**" }
spec.platforms = { :ios => "8.0" } spec.platforms = { :ios => "8.0" }
spec.subspec "SonarKitLayoutPlugin" do |ss| spec.subspec "SonarKitLayoutPlugin" do |ss|

4
iOS/third-party-podspecs/Folly.podspec
View File

@@ -11,6 +11,8 @@ Pod::Spec.new do |spec|
spec.dependency 'boost-for-react-native' spec.dependency 'boost-for-react-native'
spec.dependency 'DoubleConversion' spec.dependency 'DoubleConversion'
spec.dependency 'glog' spec.dependency 'glog'
spec.dependency 'OpenSSL-Universal', '~> 1.0'
spec.dependency 'CocoaLibEvent', '~> 1.0'
spec.compiler_flags = '-DFOLLY_HAVE_PTHREAD=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 -frtti spec.compiler_flags = '-DFOLLY_HAVE_PTHREAD=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 -frtti
-fexceptions -fexceptions
-std=c++14 -std=c++14
@@ -109,7 +111,7 @@ Pod::Spec.new do |spec|
spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
"CLANG_CXX_LANGUAGE_STANDARD" => "c++11", "CLANG_CXX_LANGUAGE_STANDARD" => "c++11",
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"/usr/local/include\" \"/usr/local/Cellar/openssl/1.0.2o_1/include\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\"" } "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\"" }
# Pinning to the same version as React.podspec. # Pinning to the same version as React.podspec.
spec.platforms = { :ios => "8.0"} spec.platforms = { :ios => "8.0"}

2
iOS/third-party-podspecs/RSocket.podspec
View File

@@ -47,7 +47,7 @@ Pod::Spec.new do |spec|
spec.header_dir = './*' spec.header_dir = './*'
spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
"CLANG_CXX_LANGUAGE_STANDARD" => "c++14", "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/** \"/usr/local/include\" \"/usr/local/Cellar/openssl/1.0.2o_1/include\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/DoubleConversion\"/**" } "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/DoubleConversion\"/**" }
spec.platforms = { :ios => "8.0" } spec.platforms = { :ios => "8.0" }
end end

3
xplat/Sonar/SonarKitCPP.podspec
View File

@@ -20,5 +20,6 @@ Pod::Spec.new do |spec|
spec.platforms = { :ios => "8.0" } spec.platforms = { :ios => "8.0" }
spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
"CLANG_CXX_LANGUAGE_STANDARD" => "c++14", "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"/usr/local/include\" \"/usr/local/Cellar/openssl/1.0.2o_1/include\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" }
end end
# \"/usr/local/include\" \"/usr/local/Cellar/openssl/1.0.2o_1/include\"