From 045fabb290f59e59900f5cbff80c3e896c71f68c Mon Sep 17 00:00:00 2001
From: Jorge Canizales <jcanizales@google.com>
Date: Tue, 21 Apr 2015 11:39:37 -0700
Subject: [PATCH] Moves RxLibrary.podspec into gRPC.podspec
---
RxLibrary.podspec | 16 ----------------
gRPC.podspec | 10 +++++++++-
src/objective-c/examples/Sample/Podfile | 1 -
3 files changed, 9 insertions(+), 18 deletions(-)
delete mode 100644 RxLibrary.podspec
diff --git a/RxLibrary.podspec b/RxLibrary.podspec
deleted file mode 100644
index d160f17d73..0000000000
--- a/RxLibrary.podspec
+++ /dev/null
@@ -1,16 +0,0 @@
-Pod::Spec.new do |s|
- s.name = 'RxLibrary'
- s.version = '0.0.1'
- s.summary = 'Reactive Extensions library for iOS'
- s.homepage = 'https://github.com/grpc/grpc/tree/master/src/objective-c/RxLibrary'
- s.license = 'New BSD'
- s.authors = { 'Jorge Canizales' => 'jcanizales@google.com' }
-
- # s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => 'release-0_5_0' }
- s.source_files = 'src/objective-c/RxLibrary/*.{h,m}', 'src/objective-c/RxLibrary/transformations/*.{h,m}', 'src/objective-c/RxLibrary/private/*.{h,m}'
- s.private_header_files = 'src/objective-c/RxLibrary/private/*.h'
-
- s.platform = :ios
- s.ios.deployment_target = '6.0'
- s.requires_arc = true
-end
diff --git a/gRPC.podspec b/gRPC.podspec
index 4bf1d3515e..654f613f1c 100644
--- a/gRPC.podspec
+++ b/gRPC.podspec
@@ -14,7 +14,16 @@ Pod::Spec.new do |s|
s.ios.deployment_target = '6.0'
s.requires_arc = true
+ s.subspec 'RxLibrary' do |rs|
+ rs.summary = 'Reactive Extensions library for iOS'
+ rs.authors = { 'Jorge Canizales' => 'jcanizales@google.com' }
+
+ rs.source_files = 'src/objective-c/RxLibrary/*.{h,m}', 'src/objective-c/RxLibrary/transformations/*.{h,m}', 'src/objective-c/RxLibrary/private/*.{h,m}'
+ rs.private_header_files = 'src/objective-c/RxLibrary/private/*.h'
+ end
+
s.subspec 'C-Core' do |cs|
+ cs.summary = 'Core gRPC library, written in C'
cs.authors = { 'Craig Tiller' => 'ctiller@google.com',
'David Klempner' => 'klempner@google.com',
'Nicolas Noble' => 'nnoble@google.com',
@@ -54,5 +63,4 @@ Pod::Spec.new do |s|
CMD
s.xcconfig = { 'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/Headers/Public/gRPC/include"' }
- s.dependency 'RxLibrary', '~> 0.0'
end
diff --git a/src/objective-c/examples/Sample/Podfile b/src/objective-c/examples/Sample/Podfile
index df07ab026a..848627ff54 100644
--- a/src/objective-c/examples/Sample/Podfile
+++ b/src/objective-c/examples/Sample/Podfile
@@ -2,7 +2,6 @@ source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '8.0'
pod 'gRPC', :path => "../../../.."
-pod 'RxLibrary', :path => "../../../.."
link_with 'Sample', 'SampleTests'
--
GitLab