From 6463ce890c0d8816657182a295018ee9f161c466 Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Mon, 11 Jun 2018 11:58:28 +0100 Subject: [PATCH] update the reference from iOS-OSS to master --- SonarKit.podspec | 3 +-- iOS/Podfile | 2 -- iOS/Podfile.lock | 8 ++++---- xplat/Sonar/Sonar.podspec | 4 +--- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/SonarKit.podspec b/SonarKit.podspec index 3b449eccb..238aecde2 100644 --- a/SonarKit.podspec +++ b/SonarKit.podspec @@ -10,9 +10,8 @@ Pod::Spec.new do |spec| spec.summary = 'Sonar iOS podspec' spec.authors = 'Facebook' spec.static_framework = true - # spec.prepare_command = 'mv src double-conversion' spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :branch=> "iOS-OSS" } + :branch=> "master" } spec.module_name = 'SonarKit' spec.dependency 'Folly' spec.dependency 'Sonar' diff --git a/iOS/Podfile b/iOS/Podfile index 88b7f0547..63a63d759 100644 --- a/iOS/Podfile +++ b/iOS/Podfile @@ -9,8 +9,6 @@ target 'SonarKit' do # 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 'RSocket', :podspec => 'third-party-podspecs/RSocket.podspec' pod 'DoubleConversion', :podspec => 'third-party-podspecs/DoubleConversion.podspec' diff --git a/iOS/Podfile.lock b/iOS/Podfile.lock index f4309de83..1cf648505 100644 --- a/iOS/Podfile.lock +++ b/iOS/Podfile.lock @@ -53,10 +53,10 @@ CHECKOUT OPTIONS: :commit: 588303b43efa5082d654b6f75d1b84a6ba4b5b9e :git: https://github.com/rsms/PeerTalk.git RSocket: - :commit: 89b368ce04d9b319593815c6a69ad0a681596146 + :commit: 11491fb22aaaf29b2702a1723561db51b314dd0f :git: https://github.com/rsocket/rsocket-cpp.git Sonar: - :commit: 03ffb3640a7ee21620fc62f9dcccb13b2f5af03c + :commit: e6f1e3f018cb4eb8d1d1bfd09851a780f08656fd :git: https://github.com/facebook/Sonar.git SPEC CHECKSUMS: @@ -69,8 +69,8 @@ SPEC CHECKSUMS: OpenSSL-Static: bd17e34564a8591ad76b740318683a6caa19a13e PeerTalk: aadc42bc7d7f19e89f817b59ef8196305a711504 RSocket: e9ee232080f995ba8f403ccf4cb61238a5646cb6 - Sonar: a7d8648c0536858abf352d481d57957adf01859b + Sonar: 29d8fb9b010e56fa1358be996d68d4b436dd8c21 -PODFILE CHECKSUM: a6a7b2201d324f787ef4956b045f021e7152fddf +PODFILE CHECKSUM: c3be9232e8e3190250398e3f9b310c5585d7d26b COCOAPODS: 1.5.2 diff --git a/xplat/Sonar/Sonar.podspec b/xplat/Sonar/Sonar.podspec index b766908bd..e32744c57 100644 --- a/xplat/Sonar/Sonar.podspec +++ b/xplat/Sonar/Sonar.podspec @@ -5,9 +5,8 @@ Pod::Spec.new do |spec| spec.homepage = 'https://github.com/facebook/sonar' spec.summary = 'SonarKit core cpp code with network implementation' spec.authors = 'Facebook' - # spec.prepare_command = 'mv src double-conversion' spec.source = { :git => 'https://github.com/facebook/Sonar.git', - :branch => 'iOS-OSS' } + :branch => 'master' } spec.module_name = 'Sonar' spec.public_header_files = 'xplat/Sonar/*.h' spec.source_files = 'xplat/Sonar/*.{h,cpp,m,mm}' @@ -22,4 +21,3 @@ Pod::Spec.new do |spec| "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" } end -# \"/usr/local/include\" \"/usr/local/Cellar/openssl/1.0.2o_1/include\"