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

update

Browse Source
This commit is contained in:
Pritesh Nandgaonkar
2018-06-05 15:16:03 -04:00
parent 9846aed138
commit 43086d9c93
7 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SonarKit.podspec
View File

@@ -17,7 +17,7 @@ Pod::Spec.new do |spec|
spec.dependency 'Folly' spec.dependency 'Folly'
spec.dependency 'Sonar' spec.dependency 'Sonar'
spec.dependency 'CocoaAsyncSocket', '~> 7.6' spec.dependency 'CocoaAsyncSocket', '~> 7.6'
spec.dependency 'PeerTalkSonar' spec.dependency 'PeerTalk'
spec.dependency 'OpenSSL-Universal', '~> 1.0' 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.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}', spec.public_header_files = 'iOS/SonarKit/CppBridge/*.{h}',

2
iOS/Podfile
View File

@@ -11,7 +11,7 @@ target 'SonarKit' do
# Third party deps podspec link # Third party deps podspec link
# pod 'PeerTalk', :git => 'https://github.com/rsms/peertalk' # 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 'RSocket', :podspec => 'third-party-podspecs/RSocket.podspec'
pod 'DoubleConversion', :podspec => 'third-party-podspecs/DoubleConversion.podspec' pod 'DoubleConversion', :podspec => 'third-party-podspecs/DoubleConversion.podspec'
pod 'glog', :podspec => 'third-party-podspecs/glog.podspec' pod 'glog', :podspec => 'third-party-podspecs/glog.podspec'

18
iOS/Podfile.lock
View File

@@ -11,7 +11,7 @@ PODS:
- OpenSSL-Universal (~> 1.0) - 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 (1.0.0)
- RSocket (0.10.0): - RSocket (0.10.0):
- Folly - Folly
- Sonar (0.0.1): - Sonar (0.0.1):
@@ -23,9 +23,9 @@ DEPENDENCIES:
- DoubleConversion (from `third-party-podspecs/DoubleConversion.podspec`) - DoubleConversion (from `third-party-podspecs/DoubleConversion.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`)
- PeerTalk (from `https://github.com/rsms/peertalk`) - PeerTalk (from `third-party-podspecs/PeerTalk.podspec`)
- RSocket (from `third-party-podspecs/RSocket.podspec`) - RSocket (from `third-party-podspecs/RSocket.podspec`)
- Sonar (from `../xplat/Sonar/SonarKitCPP.podspec`) - Sonar (from `../xplat/Sonar/Sonar.podspec`)
SPEC REPOS: SPEC REPOS:
https://github.com/cocoapods/specs.git: https://github.com/cocoapods/specs.git:
@@ -42,18 +42,18 @@ EXTERNAL SOURCES:
glog: glog:
:podspec: third-party-podspecs/glog.podspec :podspec: third-party-podspecs/glog.podspec
PeerTalk: PeerTalk:
:git: https://github.com/rsms/peertalk :podspec: third-party-podspecs/PeerTalk.podspec
RSocket: RSocket:
:podspec: third-party-podspecs/RSocket.podspec :podspec: third-party-podspecs/RSocket.podspec
Sonar: Sonar:
:podspec: "../xplat/Sonar/SonarKitCPP.podspec" :podspec: "../xplat/Sonar/Sonar.podspec"
CHECKOUT OPTIONS: CHECKOUT OPTIONS:
PeerTalk: PeerTalk:
:commit: 588303b43efa5082d654b6f75d1b84a6ba4b5b9e :commit: 588303b43efa5082d654b6f75d1b84a6ba4b5b9e
:git: https://github.com/rsms/peertalk :git: https://github.com/rsms/PeerTalk.git
RSocket: RSocket:
:commit: f3531f877f26d13c81cfa9c73a07919d76a9dddd :commit: 193002818e53e7a7d73ee362627ddf1fdabc4493
:git: https://github.com/rsocket/rsocket-cpp.git :git: https://github.com/rsocket/rsocket-cpp.git
Sonar: Sonar:
:commit: 8d48f5a3eb26c6e982abefa30f5a8e0c19b5b4a6 :commit: 8d48f5a3eb26c6e982abefa30f5a8e0c19b5b4a6
@@ -67,10 +67,10 @@ SPEC CHECKSUMS:
Folly: ce1c216bcb099ca6cda58fefbba02bf2e9fe0381 Folly: ce1c216bcb099ca6cda58fefbba02bf2e9fe0381
glog: fdb5d40eb83acd6a4d5d61d95ecc583f5970a119 glog: fdb5d40eb83acd6a4d5d61d95ecc583f5970a119
OpenSSL-Universal: 401888162f11c33ebbd46f782d9229da35c61327 OpenSSL-Universal: 401888162f11c33ebbd46f782d9229da35c61327
PeerTalk: f5389c286e4d477e59b73dfbf25c5c70a2464761 PeerTalk: aadc42bc7d7f19e89f817b59ef8196305a711504
RSocket: 38b24504db9efbfb018a3b2b23a2d9500140a2a7 RSocket: 38b24504db9efbfb018a3b2b23a2d9500140a2a7
Sonar: 29d8fb9b010e56fa1358be996d68d4b436dd8c21 Sonar: 29d8fb9b010e56fa1358be996d68d4b436dd8c21
PODFILE CHECKSUM: ea1c982eb3a27e26c91d456fff45930d31f3e115 PODFILE CHECKSUM: a6a7b2201d324f787ef4956b045f021e7152fddf
COCOAPODS: 1.5.2 COCOAPODS: 1.5.2

2
iOS/Sample/Podfile
View File

@@ -10,7 +10,7 @@ target 'Sample' do
pod 'DoubleConversion', :podspec => '../third-party-podspecs/DoubleConversion.podspec' pod 'DoubleConversion', :podspec => '../third-party-podspecs/DoubleConversion.podspec'
pod 'glog', :podspec => '../third-party-podspecs/glog.podspec' pod 'glog', :podspec => '../third-party-podspecs/glog.podspec'
pod 'Folly', :podspec => '../third-party-podspecs/Folly.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 'ComponentKit', :podspec => '../third-party-podspecs/ComponentKit.podspec'
pod 'Yoga','~>1.8.1', :modular_headers => true pod 'Yoga','~>1.8.1', :modular_headers => true
pod 'Sonar', :podspec => '../../xplat/Sonar/Sonar.podspec' pod 'Sonar', :podspec => '../../xplat/Sonar/Sonar.podspec'

30
iOS/Sample/Podfile.lock
View File

@@ -13,7 +13,7 @@ PODS:
- OpenSSL-Universal (~> 1.0) - OpenSSL-Universal (~> 1.0)
- glog (0.3.5) - glog (0.3.5)
- OpenSSL-Universal (1.0.2.13) - OpenSSL-Universal (1.0.2.13)
- PeerTalkSonar (0.0.2) - PeerTalk (1.0.0)
- RSocket (0.10.0): - RSocket (0.10.0):
- Folly - Folly
- Sonar (0.0.1): - Sonar (0.0.1):
@@ -23,7 +23,7 @@ PODS:
- CocoaAsyncSocket (~> 7.6) - CocoaAsyncSocket (~> 7.6)
- Folly - Folly
- OpenSSL-Universal (~> 1.0) - OpenSSL-Universal (~> 1.0)
- PeerTalkSonar - PeerTalk
- Sonar - Sonar
- SonarKit/SKIOSNetworkPlugin (= 0.0.1) - SonarKit/SKIOSNetworkPlugin (= 0.0.1)
- SonarKit/SonarKitLayoutComponentKitSupport (= 0.0.1) - SonarKit/SonarKitLayoutComponentKitSupport (= 0.0.1)
@@ -34,7 +34,7 @@ PODS:
- CocoaAsyncSocket (~> 7.6) - CocoaAsyncSocket (~> 7.6)
- Folly - Folly
- OpenSSL-Universal (~> 1.0) - OpenSSL-Universal (~> 1.0)
- PeerTalkSonar - PeerTalk
- Sonar - Sonar
- SonarKit/SonarKitNetworkPlugin - SonarKit/SonarKitNetworkPlugin
- SonarKit/SonarKitLayoutComponentKitSupport (0.0.1): - SonarKit/SonarKitLayoutComponentKitSupport (0.0.1):
@@ -42,7 +42,7 @@ PODS:
- ComponentKit - ComponentKit
- Folly - Folly
- OpenSSL-Universal (~> 1.0) - OpenSSL-Universal (~> 1.0)
- PeerTalkSonar - PeerTalk
- Sonar - Sonar
- SonarKit/SonarKitLayoutPlugin - SonarKit/SonarKitLayoutPlugin
- Yoga (~> 1.8) - Yoga (~> 1.8)
@@ -50,7 +50,7 @@ PODS:
- CocoaAsyncSocket (~> 7.6) - CocoaAsyncSocket (~> 7.6)
- Folly - Folly
- OpenSSL-Universal (~> 1.0) - OpenSSL-Universal (~> 1.0)
- PeerTalkSonar - PeerTalk
- Sonar - Sonar
- Yoga (~> 1.8) - Yoga (~> 1.8)
- YogaKit (= 1.8.1) - YogaKit (= 1.8.1)
@@ -58,7 +58,7 @@ PODS:
- CocoaAsyncSocket (~> 7.6) - CocoaAsyncSocket (~> 7.6)
- Folly - Folly
- OpenSSL-Universal (~> 1.0) - OpenSSL-Universal (~> 1.0)
- PeerTalkSonar - PeerTalk
- Sonar - Sonar
- Yoga (1.8.1) - Yoga (1.8.1)
- YogaKit (1.8.1): - YogaKit (1.8.1):
@@ -69,7 +69,7 @@ DEPENDENCIES:
- DoubleConversion (from `../third-party-podspecs/DoubleConversion.podspec`) - DoubleConversion (from `../third-party-podspecs/DoubleConversion.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`)
- PeerTalkSonar (from `../third-party-podspecs/PeerTalkSonar.podspec`) - PeerTalk (from `../third-party-podspecs/PeerTalk.podspec`)
- RSocket (from `../third-party-podspecs/RSocket.podspec`) - RSocket (from `../third-party-podspecs/RSocket.podspec`)
- Sonar (from `../../xplat/Sonar/Sonar.podspec`) - Sonar (from `../../xplat/Sonar/Sonar.podspec`)
- SonarKit (from `../../SonarKit.podspec`) - SonarKit (from `../../SonarKit.podspec`)
@@ -95,8 +95,8 @@ EXTERNAL SOURCES:
:podspec: "../third-party-podspecs/Folly.podspec" :podspec: "../third-party-podspecs/Folly.podspec"
glog: glog:
:podspec: "../third-party-podspecs/glog.podspec" :podspec: "../third-party-podspecs/glog.podspec"
PeerTalkSonar: PeerTalk:
:podspec: "../third-party-podspecs/PeerTalkSonar.podspec" :podspec: "../third-party-podspecs/PeerTalk.podspec"
RSocket: RSocket:
:podspec: "../third-party-podspecs/RSocket.podspec" :podspec: "../third-party-podspecs/RSocket.podspec"
Sonar: Sonar:
@@ -106,13 +106,13 @@ EXTERNAL SOURCES:
CHECKOUT OPTIONS: CHECKOUT OPTIONS:
ComponentKit: ComponentKit:
:commit: de618385741aacd659ce3eae5cb27bbf6b5a9963 :commit: 368a8b74e1940b9c86b1a883cd7668bc5a204536
:git: https://github.com/facebook/ComponentKit.git :git: https://github.com/facebook/ComponentKit.git
PeerTalkSonar: PeerTalk:
:commit: 588303b43efa5082d654b6f75d1b84a6ba4b5b9e :commit: 588303b43efa5082d654b6f75d1b84a6ba4b5b9e
:git: https://github.com/rsms/PeerTalk.git :git: https://github.com/rsms/PeerTalk.git
RSocket: RSocket:
:commit: f3531f877f26d13c81cfa9c73a07919d76a9dddd :commit: 193002818e53e7a7d73ee362627ddf1fdabc4493
:git: https://github.com/rsocket/rsocket-cpp.git :git: https://github.com/rsocket/rsocket-cpp.git
Sonar: Sonar:
:commit: 8d48f5a3eb26c6e982abefa30f5a8e0c19b5b4a6 :commit: 8d48f5a3eb26c6e982abefa30f5a8e0c19b5b4a6
@@ -130,13 +130,13 @@ SPEC CHECKSUMS:
Folly: ce1c216bcb099ca6cda58fefbba02bf2e9fe0381 Folly: ce1c216bcb099ca6cda58fefbba02bf2e9fe0381
glog: fdb5d40eb83acd6a4d5d61d95ecc583f5970a119 glog: fdb5d40eb83acd6a4d5d61d95ecc583f5970a119
OpenSSL-Universal: 401888162f11c33ebbd46f782d9229da35c61327 OpenSSL-Universal: 401888162f11c33ebbd46f782d9229da35c61327
PeerTalkSonar: 648657ad6551ee1214555c8c3f1397a28c588156 PeerTalk: aadc42bc7d7f19e89f817b59ef8196305a711504
RSocket: 38b24504db9efbfb018a3b2b23a2d9500140a2a7 RSocket: 38b24504db9efbfb018a3b2b23a2d9500140a2a7
Sonar: 29d8fb9b010e56fa1358be996d68d4b436dd8c21 Sonar: 29d8fb9b010e56fa1358be996d68d4b436dd8c21
SonarKit: 1314be2c82396a24f9805818c731d931a7c7fef1 SonarKit: 748eeb4e6f10af7abe946e11d087dd2a2d5b514c
Yoga: e6f1fed82138c17da5332e15e5770abf0e9cc386 Yoga: e6f1fed82138c17da5332e15e5770abf0e9cc386
YogaKit: bb90d11e297e06abef7e0cfb20e035a6bd00cdc4 YogaKit: bb90d11e297e06abef7e0cfb20e035a6bd00cdc4
PODFILE CHECKSUM: 4c4d2b2552aaa91add9481791c49206f4fce7974 PODFILE CHECKSUM: 7c2600fc131a2b041c967e8d6ffc2bd1a0383733
COCOAPODS: 1.5.2 COCOAPODS: 1.5.2

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

@@ -361,7 +361,7 @@
"-l\"ComponentKit\"", "-l\"ComponentKit\"",
"-l\"DoubleConversion\"", "-l\"DoubleConversion\"",
"-l\"Folly\"", "-l\"Folly\"",
"-l\"PeerTalkSonar\"", "-l\"PeerTalk\"",
"-l\"Sonar\"", "-l\"Sonar\"",
"-l\"SonarKit\"", "-l\"SonarKit\"",
"-l\"Yoga\"", "-l\"Yoga\"",
@@ -426,7 +426,7 @@
"-l\"ComponentKit\"", "-l\"ComponentKit\"",
"-l\"DoubleConversion\"", "-l\"DoubleConversion\"",
"-l\"Folly\"", "-l\"Folly\"",
"-l\"PeerTalkSonar\"", "-l\"PeerTalk\"",
"-l\"Sonar\"", "-l\"Sonar\"",
"-l\"SonarKit\"", "-l\"SonarKit\"",
"-l\"Yoga\"", "-l\"Yoga\"",

7
iOS/third-party-podspecs/PeerTalkSonar.podspec → iOS/third-party-podspecs/PeerTalk.podspec
View File

@@ -1,6 +1,6 @@
Pod::Spec.new do |spec| Pod::Spec.new do |spec|
spec.name = 'PeerTalkSonar' spec.name = 'PeerTalk'
spec.version = '0.0.2' spec.version = '1.0.0'
spec.license = { :type => 'MIT' } spec.license = { :type => 'MIT' }
spec.homepage = 'http://rsms.me/peertalk/' spec.homepage = 'http://rsms.me/peertalk/'
spec.authors = { 'Rasmus Andersson' => 'rasmus@notion.se' } spec.authors = { 'Rasmus Andersson' => 'rasmus@notion.se' }
@@ -13,4 +13,7 @@ Pod::Spec.new do |spec|
spec.osx.deployment_target = '10.10' 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.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 end