Merge branch 'delayed-write' into grand-unified-closures

1 files changed, 18 insertions, 18 deletions

diff --git a/gRPC.podspec b/gRPC.podspec
index 5ca0cab98b..4f2203c7a5 100644
--- a/gRPC.podspec
+++ b/gRPC.podspec
@@ -43,14 +43,13 @@ Pod::Spec.new do |s|
   s.license  = 'New BSD'
   s.authors  = { 'The gRPC contributors' => 'grpc-packages@google.com' }
 
-  s.source = {
-    :git => 'https://github.com/grpc/grpc.git',
-    :tag => "release-#{version.gsub(/\./, '_')}-objectivec-#{version}",
-  }
+  s.source = { :git => 'https://github.com/grpc/grpc.git',
+               :tag => "release-#{version.gsub(/\./, '_')}-objectivec-#{version}",
+               :submodules => true }
+
 
   s.ios.deployment_target = '7.1'
   s.osx.deployment_target = '10.9'
-<<<<<<< HEAD
   s.requires_arc = true
 
   objc_dir = 'src/objective-c'
@@ -731,21 +730,22 @@ Pod::Spec.new do |s|
     ss.source_files = "#{src_dir}/*.{h,m}", "#{src_dir}/**/*.{h,m}"
     ss.private_header_files = "#{src_dir}/private/*.h"
     ss.header_mappings_dir = "#{objc_dir}"
-=======
->>>>>>> 32d3fbe284ddd7e90b49cdf72349d661869969ca
 
-  name = 'GRPCClient'
-  s.module_name = name
-  s.header_dir = name
+    ss.dependency 'gRPC/C-Core'
+    ss.dependency 'gRPC/RxLibrary'
 
-  src_dir = 'src/objective-c/GRPCClient'
-  s.source_files = "#{src_dir}/*.{h,m}", "#{src_dir}/**/*.{h,m}"
-  s.private_header_files = "#{src_dir}/private/*.h"
-  s.header_mappings_dir = "#{src_dir}"
+    # Certificates, to be able to establish TLS connections:
+    ss.resource_bundles = { 'gRPCCertificates' => ['etc/roots.pem'] }
+  end
 
-  s.dependency 'gRPC-Core', version
-  s.dependency 'gRPC-RxLibrary', version
+  # RPC library for ProtocolBuffers, based on gRPC
+  s.subspec 'ProtoRPC' do |ss|
+    src_dir = "#{objc_dir}/ProtoRPC"
+    ss.source_files = "#{src_dir}/*.{h,m}"
+    ss.header_mappings_dir = "#{objc_dir}"
 
-  # Certificates, to be able to establish TLS connections:
-  s.resource_bundles = { 'gRPCCertificates' => ['etc/roots.pem'] }
+    ss.dependency 'gRPC/GRPCClient'
+    ss.dependency 'gRPC/RxLibrary'
+    ss.dependency 'Protobuf', '~> 3.0.0-alpha-4'
+  end
 end