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

update the reference from iOS-OSS to master

Browse Source
This commit is contained in:
Pritesh Nandgaonkar
2018-06-11 11:58:28 +01:00
parent 4a989cf8ef
commit 6463ce890c
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SonarKit.podspec
View File

@@ -10,9 +10,8 @@ Pod::Spec.new do |spec|
spec.summary = 'Sonar iOS podspec' spec.summary = 'Sonar iOS podspec'
spec.authors = 'Facebook' spec.authors = 'Facebook'
spec.static_framework = true spec.static_framework = true
# spec.prepare_command = 'mv src double-conversion'
spec.source = { :git => 'https://github.com/facebook/Sonar.git', spec.source = { :git => 'https://github.com/facebook/Sonar.git',
:branch=> "iOS-OSS" } :branch=> "master" }
spec.module_name = 'SonarKit' spec.module_name = 'SonarKit'
spec.dependency 'Folly' spec.dependency 'Folly'
spec.dependency 'Sonar' spec.dependency 'Sonar'

2
iOS/Podfile
View File

@@ -9,8 +9,6 @@ target 'SonarKit' do
# Pods for SonarKit # Pods for SonarKit
# Third party deps podspec link
# pod 'PeerTalk', :git => 'https://github.com/rsms/peertalk'
pod 'PeerTalk', :podspec => 'third-party-podspecs/PeerTalk.podspec' pod 'PeerTalk', :podspec => 'third-party-podspecs/PeerTalk.podspec'
pod 'RSocket', :podspec => 'third-party-podspecs/RSocket.podspec' pod 'RSocket', :podspec => 'third-party-podspecs/RSocket.podspec'
pod 'DoubleConversion', :podspec => 'third-party-podspecs/DoubleConversion.podspec' pod 'DoubleConversion', :podspec => 'third-party-podspecs/DoubleConversion.podspec'

8
iOS/Podfile.lock
View File

@@ -53,10 +53,10 @@ CHECKOUT OPTIONS:
:commit: 588303b43efa5082d654b6f75d1b84a6ba4b5b9e :commit: 588303b43efa5082d654b6f75d1b84a6ba4b5b9e
:git: https://github.com/rsms/PeerTalk.git :git: https://github.com/rsms/PeerTalk.git
RSocket: RSocket:
:commit: 89b368ce04d9b319593815c6a69ad0a681596146 :commit: 11491fb22aaaf29b2702a1723561db51b314dd0f
:git: https://github.com/rsocket/rsocket-cpp.git :git: https://github.com/rsocket/rsocket-cpp.git
Sonar: Sonar:
:commit: 03ffb3640a7ee21620fc62f9dcccb13b2f5af03c :commit: e6f1e3f018cb4eb8d1d1bfd09851a780f08656fd
:git: https://github.com/facebook/Sonar.git :git: https://github.com/facebook/Sonar.git
SPEC CHECKSUMS: SPEC CHECKSUMS:
@@ -69,8 +69,8 @@ SPEC CHECKSUMS:
OpenSSL-Static: bd17e34564a8591ad76b740318683a6caa19a13e OpenSSL-Static: bd17e34564a8591ad76b740318683a6caa19a13e
PeerTalk: aadc42bc7d7f19e89f817b59ef8196305a711504 PeerTalk: aadc42bc7d7f19e89f817b59ef8196305a711504
RSocket: e9ee232080f995ba8f403ccf4cb61238a5646cb6 RSocket: e9ee232080f995ba8f403ccf4cb61238a5646cb6
Sonar: a7d8648c0536858abf352d481d57957adf01859b Sonar: 29d8fb9b010e56fa1358be996d68d4b436dd8c21
PODFILE CHECKSUM: a6a7b2201d324f787ef4956b045f021e7152fddf PODFILE CHECKSUM: c3be9232e8e3190250398e3f9b310c5585d7d26b
COCOAPODS: 1.5.2 COCOAPODS: 1.5.2

4
xplat/Sonar/Sonar.podspec
View File

@@ -5,9 +5,8 @@ Pod::Spec.new do |spec|
spec.homepage = 'https://github.com/facebook/sonar' spec.homepage = 'https://github.com/facebook/sonar'
spec.summary = 'SonarKit core cpp code with network implementation' spec.summary = 'SonarKit core cpp code with network implementation'
spec.authors = 'Facebook' spec.authors = 'Facebook'
# spec.prepare_command = 'mv src double-conversion'
spec.source = { :git => 'https://github.com/facebook/Sonar.git', spec.source = { :git => 'https://github.com/facebook/Sonar.git',
:branch => 'iOS-OSS' } :branch => 'master' }
spec.module_name = 'Sonar' spec.module_name = 'Sonar'
spec.public_header_files = 'xplat/Sonar/*.h' spec.public_header_files = 'xplat/Sonar/*.h'
spec.source_files = 'xplat/Sonar/*.{h,cpp,m,mm}' spec.source_files = 'xplat/Sonar/*.{h,cpp,m,mm}'
@@ -22,4 +21,3 @@ Pod::Spec.new do |spec|
"CLANG_CXX_LANGUAGE_STANDARD" => "c++14", "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(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\"