From 2dacea8541c1e2622362cb3d20ba5232694ecff3 Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Mon, 1 Apr 2019 08:46:32 -0700 Subject: [PATCH] Published Flipper-PeerTalk dependency on Cocoapods (#395) Summary: I have published the new tag of Peertalk on my [fork](https://github.com/priteshrnandgaonkar/peertalk) and published a [Flipper-PeerTalk](https://github.com/CocoaPods/Specs/blob/80e4cd9a05f45579a82a41c96afe3e8af3b2c08f/Specs/d/6/6/Flipper-PeerTalk/0.0.4/Flipper-PeerTalk.podspec.json) pod on cocoapods. There was no reply on the [request](https://github.com/rsms/peertalk/issues/48) to publish the new version of the peertalk on their repository and it was blocking us to publish Flipper and FlipperKit pods to Cocoapods. For more context follow the issue #132. With this PR we would have all our dependencies on cocoapods and thus we can now publish Flipper and FlipperKit pods on the cocoapods master repository. I have also added the Flipper-PeerTalk podspec file for future updates. Pull Request resolved: https://github.com/facebook/flipper/pull/395 Reviewed By: passy Differential Revision: D14642440 Pulled By: priteshrnandgaonkar fbshipit-source-id: 7847c19cddea358ffb62d2c6f16fc06d1afa1ea1 --- iOS/FlipperKit.podspec | 4 ++-- iOS/Podfile | 2 +- iOS/Podspecs/Flipper-PeerTalk.podspec | 18 ++++++++++++++++++ .../SampleSwift.xcodeproj/project.pbxproj | 2 -- 4 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 iOS/Podspecs/Flipper-PeerTalk.podspec diff --git a/iOS/FlipperKit.podspec b/iOS/FlipperKit.podspec index e97eb76ff..d33b505f3 100644 --- a/iOS/FlipperKit.podspec +++ b/iOS/FlipperKit.podspec @@ -49,7 +49,7 @@ Pod::Spec.new do |spec| spec.subspec "FKPortForwarding" do |ss| ss.header_dir = "FKPortForwarding" ss.dependency 'CocoaAsyncSocket', '~> 7.6' - ss.dependency 'PeerTalk', '~>0.0.2' + ss.dependency 'Flipper-PeerTalk', '~>0.0.4' ss.compiler_flags = folly_compiler_flags ss.source_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.{h,m}' ss.private_header_files = 'iOS/FlipperKit/FKPortForwarding/FKPortForwarding{Server,Common}.h' @@ -83,7 +83,7 @@ Pod::Spec.new do |spec| 'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h', 'iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.h', 'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h' - header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\"" + header_search_paths = "\"$(PODS_ROOT)/FlipperKit/iOS/FlipperKit\" \"$(PODS_ROOT)\"/Headers/Private/FlipperKit/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\"" ss.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", "DEFINES_MODULE" => "YES", "HEADER_SEARCH_PATHS" => header_search_paths } diff --git a/iOS/Podfile b/iOS/Podfile index 825c51915..0640e62b9 100644 --- a/iOS/Podfile +++ b/iOS/Podfile @@ -10,7 +10,7 @@ target 'FlipperKit' do project 'FlipperKit.xcodeproj' pod 'Flipper', :path => '../Flipper.podspec' # Pods for SonarKit - pod 'PeerTalk', '~>0.0' + pod 'Flipper-PeerTalk', '~>0.0' pod 'Flipper-RSocket', '~>0.10' pod 'DoubleConversion', '~>1.1' pod 'glog', '~>0.3' diff --git a/iOS/Podspecs/Flipper-PeerTalk.podspec b/iOS/Podspecs/Flipper-PeerTalk.podspec new file mode 100644 index 000000000..bc08a3104 --- /dev/null +++ b/iOS/Podspecs/Flipper-PeerTalk.podspec @@ -0,0 +1,18 @@ +Pod::Spec.new do |spec| + spec.name = 'Flipper-PeerTalk' + spec.version = '0.0.4' + spec.license = { :type => 'MIT' } + spec.homepage = 'http://rsms.me/peertalk/' + spec.authors = { 'Rasmus Andersson' => 'rasmus@notion.se' } + spec.summary = 'iOS and OS X Cocoa library for communicating over USB and TCP.' + + spec.source = { :git => "https://github.com/priteshrnandgaonkar/peertalk.git", + :tag => "v0.0.3" } + spec.source_files = 'peertalk/*.{h,m}' + spec.requires_arc = true + spec.ios.deployment_target = '8.4' + spec.osx.deployment_target = '10.10' + spec.header_mappings_dir = 'peertalk' + spec.header_dir = 'peertalk' + 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" +end diff --git a/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj b/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj index f9f2e618d..2aa99988b 100644 --- a/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj +++ b/iOS/SampleSwift/SampleSwift.xcodeproj/project.pbxproj @@ -357,7 +357,6 @@ OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", - "-l\"PeerTalk\"", "-l\"crypto\"", "-l\"event\"", "-l\"event_core\"", @@ -411,7 +410,6 @@ OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", - "-l\"PeerTalk\"", "-l\"crypto\"", "-l\"event\"", "-l\"event_core\"",