From 43086d9c939349355c14a206af831212d5d9d0bd Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Tue, 5 Jun 2018 15:16:03 -0400 Subject: [PATCH] update --- SonarKit.podspec | 2 +- iOS/Podfile | 2 +- iOS/Podfile.lock | 18 +++++------ iOS/Sample/Podfile | 2 +- iOS/Sample/Podfile.lock | 30 +++++++++---------- iOS/Sample/Sample.xcodeproj/project.pbxproj | 4 +-- ...PeerTalkSonar.podspec => PeerTalk.podspec} | 7 +++-- 7 files changed, 34 insertions(+), 31 deletions(-) rename iOS/third-party-podspecs/{PeerTalkSonar.podspec => PeerTalk.podspec} (84%) diff --git a/SonarKit.podspec b/SonarKit.podspec index 9f67932c5..76ac44b59 100644 --- a/SonarKit.podspec +++ b/SonarKit.podspec @@ -17,7 +17,7 @@ Pod::Spec.new do |spec| spec.dependency 'Folly' spec.dependency 'Sonar' spec.dependency 'CocoaAsyncSocket', '~> 7.6' - spec.dependency 'PeerTalkSonar' + spec.dependency 'PeerTalk' spec.dependency 'OpenSSL-Universal', '~> 1.0' spec.source_files = 'iOS/FBDefines/*.{h,cpp,m,mm}', 'iOS/SonarKit/**/*.{h,cpp,m,mm}', 'iOS/SonarKit/FBCxxUtils/*.{h, mm}', spec.public_header_files = 'iOS/SonarKit/CppBridge/*.{h}', diff --git a/iOS/Podfile b/iOS/Podfile index 97231a927..88b7f0547 100644 --- a/iOS/Podfile +++ b/iOS/Podfile @@ -11,7 +11,7 @@ target 'SonarKit' do # Third party deps podspec link # pod 'PeerTalk', :git => 'https://github.com/rsms/peertalk' - pod 'PeerTalkSonar', :podspec => 'third-party-podspecs/PeerTalkSonar.podspec' + pod 'PeerTalk', :podspec => 'third-party-podspecs/PeerTalk.podspec' pod 'RSocket', :podspec => 'third-party-podspecs/RSocket.podspec' pod 'DoubleConversion', :podspec => 'third-party-podspecs/DoubleConversion.podspec' pod 'glog', :podspec => 'third-party-podspecs/glog.podspec' diff --git a/iOS/Podfile.lock b/iOS/Podfile.lock index bbc771de5..d9e806e7b 100644 --- a/iOS/Podfile.lock +++ b/iOS/Podfile.lock @@ -11,7 +11,7 @@ PODS: - OpenSSL-Universal (~> 1.0) - glog (0.3.5) - OpenSSL-Universal (1.0.2.13) - - PeerTalk (0.0.2) + - PeerTalk (1.0.0) - RSocket (0.10.0): - Folly - Sonar (0.0.1): @@ -23,9 +23,9 @@ DEPENDENCIES: - DoubleConversion (from `third-party-podspecs/DoubleConversion.podspec`) - Folly (from `third-party-podspecs/Folly.podspec`) - glog (from `third-party-podspecs/glog.podspec`) - - PeerTalk (from `https://github.com/rsms/peertalk`) + - PeerTalk (from `third-party-podspecs/PeerTalk.podspec`) - RSocket (from `third-party-podspecs/RSocket.podspec`) - - Sonar (from `../xplat/Sonar/SonarKitCPP.podspec`) + - Sonar (from `../xplat/Sonar/Sonar.podspec`) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -42,18 +42,18 @@ EXTERNAL SOURCES: glog: :podspec: third-party-podspecs/glog.podspec PeerTalk: - :git: https://github.com/rsms/peertalk + :podspec: third-party-podspecs/PeerTalk.podspec RSocket: :podspec: third-party-podspecs/RSocket.podspec Sonar: - :podspec: "../xplat/Sonar/SonarKitCPP.podspec" + :podspec: "../xplat/Sonar/Sonar.podspec" CHECKOUT OPTIONS: PeerTalk: :commit: 588303b43efa5082d654b6f75d1b84a6ba4b5b9e - :git: https://github.com/rsms/peertalk + :git: https://github.com/rsms/PeerTalk.git RSocket: - :commit: f3531f877f26d13c81cfa9c73a07919d76a9dddd + :commit: 193002818e53e7a7d73ee362627ddf1fdabc4493 :git: https://github.com/rsocket/rsocket-cpp.git Sonar: :commit: 8d48f5a3eb26c6e982abefa30f5a8e0c19b5b4a6 @@ -67,10 +67,10 @@ SPEC CHECKSUMS: Folly: ce1c216bcb099ca6cda58fefbba02bf2e9fe0381 glog: fdb5d40eb83acd6a4d5d61d95ecc583f5970a119 OpenSSL-Universal: 401888162f11c33ebbd46f782d9229da35c61327 - PeerTalk: f5389c286e4d477e59b73dfbf25c5c70a2464761 + PeerTalk: aadc42bc7d7f19e89f817b59ef8196305a711504 RSocket: 38b24504db9efbfb018a3b2b23a2d9500140a2a7 Sonar: 29d8fb9b010e56fa1358be996d68d4b436dd8c21 -PODFILE CHECKSUM: ea1c982eb3a27e26c91d456fff45930d31f3e115 +PODFILE CHECKSUM: a6a7b2201d324f787ef4956b045f021e7152fddf COCOAPODS: 1.5.2 diff --git a/iOS/Sample/Podfile b/iOS/Sample/Podfile index ca10ae207..2e86e349a 100644 --- a/iOS/Sample/Podfile +++ b/iOS/Sample/Podfile @@ -10,7 +10,7 @@ target 'Sample' do pod 'DoubleConversion', :podspec => '../third-party-podspecs/DoubleConversion.podspec' pod 'glog', :podspec => '../third-party-podspecs/glog.podspec' pod 'Folly', :podspec => '../third-party-podspecs/Folly.podspec' - pod 'PeerTalkSonar', :podspec => '../third-party-podspecs/PeerTalkSonar.podspec' + pod 'PeerTalk', :podspec => '../third-party-podspecs/PeerTalk.podspec' pod 'ComponentKit', :podspec => '../third-party-podspecs/ComponentKit.podspec' pod 'Yoga','~>1.8.1', :modular_headers => true pod 'Sonar', :podspec => '../../xplat/Sonar/Sonar.podspec' diff --git a/iOS/Sample/Podfile.lock b/iOS/Sample/Podfile.lock index 1d4cf4cb1..1188bfdfc 100644 --- a/iOS/Sample/Podfile.lock +++ b/iOS/Sample/Podfile.lock @@ -13,7 +13,7 @@ PODS: - OpenSSL-Universal (~> 1.0) - glog (0.3.5) - OpenSSL-Universal (1.0.2.13) - - PeerTalkSonar (0.0.2) + - PeerTalk (1.0.0) - RSocket (0.10.0): - Folly - Sonar (0.0.1): @@ -23,7 +23,7 @@ PODS: - CocoaAsyncSocket (~> 7.6) - Folly - OpenSSL-Universal (~> 1.0) - - PeerTalkSonar + - PeerTalk - Sonar - SonarKit/SKIOSNetworkPlugin (= 0.0.1) - SonarKit/SonarKitLayoutComponentKitSupport (= 0.0.1) @@ -34,7 +34,7 @@ PODS: - CocoaAsyncSocket (~> 7.6) - Folly - OpenSSL-Universal (~> 1.0) - - PeerTalkSonar + - PeerTalk - Sonar - SonarKit/SonarKitNetworkPlugin - SonarKit/SonarKitLayoutComponentKitSupport (0.0.1): @@ -42,7 +42,7 @@ PODS: - ComponentKit - Folly - OpenSSL-Universal (~> 1.0) - - PeerTalkSonar + - PeerTalk - Sonar - SonarKit/SonarKitLayoutPlugin - Yoga (~> 1.8) @@ -50,7 +50,7 @@ PODS: - CocoaAsyncSocket (~> 7.6) - Folly - OpenSSL-Universal (~> 1.0) - - PeerTalkSonar + - PeerTalk - Sonar - Yoga (~> 1.8) - YogaKit (= 1.8.1) @@ -58,7 +58,7 @@ PODS: - CocoaAsyncSocket (~> 7.6) - Folly - OpenSSL-Universal (~> 1.0) - - PeerTalkSonar + - PeerTalk - Sonar - Yoga (1.8.1) - YogaKit (1.8.1): @@ -69,7 +69,7 @@ DEPENDENCIES: - DoubleConversion (from `../third-party-podspecs/DoubleConversion.podspec`) - Folly (from `../third-party-podspecs/Folly.podspec`) - glog (from `../third-party-podspecs/glog.podspec`) - - PeerTalkSonar (from `../third-party-podspecs/PeerTalkSonar.podspec`) + - PeerTalk (from `../third-party-podspecs/PeerTalk.podspec`) - RSocket (from `../third-party-podspecs/RSocket.podspec`) - Sonar (from `../../xplat/Sonar/Sonar.podspec`) - SonarKit (from `../../SonarKit.podspec`) @@ -95,8 +95,8 @@ EXTERNAL SOURCES: :podspec: "../third-party-podspecs/Folly.podspec" glog: :podspec: "../third-party-podspecs/glog.podspec" - PeerTalkSonar: - :podspec: "../third-party-podspecs/PeerTalkSonar.podspec" + PeerTalk: + :podspec: "../third-party-podspecs/PeerTalk.podspec" RSocket: :podspec: "../third-party-podspecs/RSocket.podspec" Sonar: @@ -106,13 +106,13 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: ComponentKit: - :commit: de618385741aacd659ce3eae5cb27bbf6b5a9963 + :commit: 368a8b74e1940b9c86b1a883cd7668bc5a204536 :git: https://github.com/facebook/ComponentKit.git - PeerTalkSonar: + PeerTalk: :commit: 588303b43efa5082d654b6f75d1b84a6ba4b5b9e :git: https://github.com/rsms/PeerTalk.git RSocket: - :commit: f3531f877f26d13c81cfa9c73a07919d76a9dddd + :commit: 193002818e53e7a7d73ee362627ddf1fdabc4493 :git: https://github.com/rsocket/rsocket-cpp.git Sonar: :commit: 8d48f5a3eb26c6e982abefa30f5a8e0c19b5b4a6 @@ -130,13 +130,13 @@ SPEC CHECKSUMS: Folly: ce1c216bcb099ca6cda58fefbba02bf2e9fe0381 glog: fdb5d40eb83acd6a4d5d61d95ecc583f5970a119 OpenSSL-Universal: 401888162f11c33ebbd46f782d9229da35c61327 - PeerTalkSonar: 648657ad6551ee1214555c8c3f1397a28c588156 + PeerTalk: aadc42bc7d7f19e89f817b59ef8196305a711504 RSocket: 38b24504db9efbfb018a3b2b23a2d9500140a2a7 Sonar: 29d8fb9b010e56fa1358be996d68d4b436dd8c21 - SonarKit: 1314be2c82396a24f9805818c731d931a7c7fef1 + SonarKit: 748eeb4e6f10af7abe946e11d087dd2a2d5b514c Yoga: e6f1fed82138c17da5332e15e5770abf0e9cc386 YogaKit: bb90d11e297e06abef7e0cfb20e035a6bd00cdc4 -PODFILE CHECKSUM: 4c4d2b2552aaa91add9481791c49206f4fce7974 +PODFILE CHECKSUM: 7c2600fc131a2b041c967e8d6ffc2bd1a0383733 COCOAPODS: 1.5.2 diff --git a/iOS/Sample/Sample.xcodeproj/project.pbxproj b/iOS/Sample/Sample.xcodeproj/project.pbxproj index 03c3c3646..d1b532e26 100644 --- a/iOS/Sample/Sample.xcodeproj/project.pbxproj +++ b/iOS/Sample/Sample.xcodeproj/project.pbxproj @@ -361,7 +361,7 @@ "-l\"ComponentKit\"", "-l\"DoubleConversion\"", "-l\"Folly\"", - "-l\"PeerTalkSonar\"", + "-l\"PeerTalk\"", "-l\"Sonar\"", "-l\"SonarKit\"", "-l\"Yoga\"", @@ -426,7 +426,7 @@ "-l\"ComponentKit\"", "-l\"DoubleConversion\"", "-l\"Folly\"", - "-l\"PeerTalkSonar\"", + "-l\"PeerTalk\"", "-l\"Sonar\"", "-l\"SonarKit\"", "-l\"Yoga\"", diff --git a/iOS/third-party-podspecs/PeerTalkSonar.podspec b/iOS/third-party-podspecs/PeerTalk.podspec similarity index 84% rename from iOS/third-party-podspecs/PeerTalkSonar.podspec rename to iOS/third-party-podspecs/PeerTalk.podspec index d0a96c588..eeac92540 100644 --- a/iOS/third-party-podspecs/PeerTalkSonar.podspec +++ b/iOS/third-party-podspecs/PeerTalk.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| - spec.name = 'PeerTalkSonar' - spec.version = '0.0.2' + spec.name = 'PeerTalk' + spec.version = '1.0.0' spec.license = { :type => 'MIT' } spec.homepage = 'http://rsms.me/peertalk/' spec.authors = { 'Rasmus Andersson' => 'rasmus@notion.se' } @@ -13,4 +13,7 @@ Pod::Spec.new do |spec| spec.osx.deployment_target = '10.10' spec.description = " PeerTalk is a iOS and OS X Cocoa library for communicating over USB and TCP.\n\n Highlights:\n\n * Provides you with USB device attach/detach events and attached device's info\n * Can connect to TCP services on supported attached devices (e.g. an iPhone), bridging the communication over USB transport\n * Offers a higher-level API (PTChannel and PTProtocol) for convenient implementations.\n * Tested and designed for libdispatch (aka Grand Central Dispatch).\n" + spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", + "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/**" } + end