Merge pull request #1388 from jcanizales/fixes-podspec

Fixes podspec and removes old generated files

gRPC.podspec

@@ -16,7 +16,9 @@ Pod::Spec.new do |s|
     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.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
 
@@ -36,35 +38,38 @@ Pod::Spec.new do |s|
     cs.requires_arc = false
     cs.libraries = 'z'
     cs.dependency 'OpenSSL', '~> 1.0.200'
-
-    # This is a workaround for Cocoapods Issue #1437.
-    # It renames time.h and string.h to grpc_time.h and grpc_string.h.
-    cs.prepare_command = <<-CMD
-      DIR_TIME="grpc/support"
-      BAD_TIME="$DIR_TIME/time.h"
-      GOOD_TIME="$DIR_TIME/grpc_time.h"
-      if [ -f "include/$BAD_TIME" ];
-      then
-        grep -rl "$BAD_TIME" include/grpc src/core | xargs sed -i '' -e s@$BAD_TIME@$GOOD_TIME@g
-        mv "include/$BAD_TIME" "include/$GOOD_TIME"
-      fi
-
-      DIR_STRING="src/core/support"
-      BAD_STRING="$DIR_STRING/string.h"
-      GOOD_STRING="$DIR_STRING/grpc_string.h"
-      if [ -f "$BAD_STRING" ];
-      then
-        grep -rl "$BAD_STRING" include/grpc src/core | xargs sed -i '' -e s@$BAD_STRING@$GOOD_STRING@g
-        mv "$BAD_STRING" "$GOOD_STRING"
-      fi
-    CMD
   end
 
+  # This is a workaround for Cocoapods Issue #1437.
+  # It renames time.h and string.h to grpc_time.h and grpc_string.h.
+  # It needs to be here (top-level) instead of in the C-Core subspec because Cocoapods doesn't run
+  # prepare_command's of subspecs.
+  s.prepare_command = <<-CMD
+    DIR_TIME="grpc/support"
+    BAD_TIME="$DIR_TIME/time.h"
+    GOOD_TIME="$DIR_TIME/grpc_time.h"
+    if [ -f "include/$BAD_TIME" ];
+    then
+      grep -rl "$BAD_TIME" include/grpc src/core | xargs sed -i '' -e s@$BAD_TIME@$GOOD_TIME@g
+      mv "include/$BAD_TIME" "include/$GOOD_TIME"
+    fi
+
+    DIR_STRING="src/core/support"
+    BAD_STRING="$DIR_STRING/string.h"
+    GOOD_STRING="$DIR_STRING/grpc_string.h"
+    if [ -f "$BAD_STRING" ];
+    then
+      grep -rl "$BAD_STRING" include/grpc src/core | xargs sed -i '' -e s@$BAD_STRING@$GOOD_STRING@g
+      mv "$BAD_STRING" "$GOOD_STRING"
+    fi
+  CMD
+
   s.subspec 'GRPCClient' do |gs|
     gs.summary = 'Objective-C wrapper around the core gRPC library.'
     gs.authors  = { 'Jorge Canizales' => 'jcanizales@google.com' }
 
-    gs.source_files = 'src/objective-c/GRPCClient/*.{h,m}', 'src/objective-c/GRPCClient/private/*.{h,m}'
+    gs.source_files = 'src/objective-c/GRPCClient/*.{h,m}',
+                      'src/objective-c/GRPCClient/private/*.{h,m}'
     gs.private_header_files = 'src/objective-c/GRPCClient/private/*.h'
 
     gs.dependency 'gRPC/C-Core'

src/objective-c/examples/Sample/Podfile.lock

 PODS:
-  - GRPCClient (0.0.1):
-    - RxLibrary (~> 0.0)
-  - RxLibrary (0.0.1)
+  - gRPC (0.0.1):
+    - gRPC/C-Core (= 0.0.1)
+    - gRPC/GRPCClient (= 0.0.1)
+    - gRPC/ProtoRPC (= 0.0.1)
+    - gRPC/RxLibrary (= 0.0.1)
+  - gRPC/C-Core (0.0.1):
+    - OpenSSL (~> 1.0.200)
+  - gRPC/GRPCClient (0.0.1):
+    - gRPC/C-Core
+    - gRPC/RxLibrary
+  - gRPC/ProtoRPC (0.0.1):
+    - gRPC/GRPCClient
+    - gRPC/RxLibrary
+  - gRPC/RxLibrary (0.0.1)
+  - OpenSSL (1.0.201)
+  - ProtocolBuffers (1.9.8)
+  - RemoteTest (0.0.1):
+    - gRPC (~> 0.0)
+    - ProtocolBuffers (~> 1.9)
+  - Route_guide (0.0.1):
+    - ProtocolBuffers (~> 1.9)
 
 DEPENDENCIES:
-  - GRPCClient (from `../../GRPCClient`)
-  - RxLibrary (from `../../RxLibrary`)
+  - gRPC (from `../../../..`)
+  - RemoteTest (from `RemoteTestClient`)
+  - Route_guide (from `RouteGuideClient`)
 
 EXTERNAL SOURCES:
-  GRPCClient:
-    :path: ../../GRPCClient
-  RxLibrary:
-    :path: ../../RxLibrary
+  gRPC:
+    :path: ../../../..
+  RemoteTest:
+    :path: RemoteTestClient
+  Route_guide:
+    :path: RouteGuideClient
 
 SPEC CHECKSUMS:
-  GRPCClient: 05c58faab99661384178bb7c5f93b60c2bfc89f8
-  RxLibrary: 70cfcf1573ec16a375b4fe61d976a3188aab9303
+  gRPC: f6c1bf5dde59ab543e4bd1d5e2ea56da4a9a0253
+  OpenSSL: 4e990d04b14015c49c800c400b86ae44a4818a5c
+  ProtocolBuffers: 9a4a171c0c7cc8f21dd29aeca4f9ac775d84a880
+  RemoteTest: 021a51c04d5795f286b379ca5ef14d0be5b2fb9b
+  Route_guide: a277da8eef182774abb050d7b81109f5878f8652
 
-COCOAPODS: 0.35.0
+COCOAPODS: 0.36.0

src/objective-c/examples/Sample/Pods/Headers/Public/GRPCClient/GRPCCall.h

-../../../../../../GRPCClient/GRPCCall.h
\ No newline at end of file

src/objective-c/examples/Sample/Pods/Headers/Public/GRPCClient/GRPCMethodName.h

-../../../../../../GRPCClient/GRPCMethodName.h
\ No newline at end of file

src/objective-c/examples/Sample/Pods/Headers/Public/RxLibrary/GRXImmediateWriter.h

-../../../../../../RxLibrary/GRXImmediateWriter.h
\ No newline at end of file

src/objective-c/examples/Sample/Pods/Headers/Public/RxLibrary/GRXMappingWriter.h

-../../../../../../RxLibrary/transformations/GRXMappingWriter.h
\ No newline at end of file

src/objective-c/examples/Sample/Pods/Headers/Public/RxLibrary/GRXWriteable.h

-../../../../../../RxLibrary/GRXWriteable.h
\ No newline at end of file

src/objective-c/examples/Sample/Pods/Headers/Public/RxLibrary/GRXWriter+Immediate.h

-../../../../../../RxLibrary/GRXWriter+Immediate.h
\ No newline at end of file

src/objective-c/examples/Sample/Pods/Headers/Public/RxLibrary/GRXWriter+Transformations.h

-../../../../../../RxLibrary/GRXWriter+Transformations.h
\ No newline at end of file

src/objective-c/examples/Sample/Pods/Headers/Public/RxLibrary/GRXWriter.h

-../../../../../../RxLibrary/GRXWriter.h
\ No newline at end of file

src/objective-c/examples/Sample/Pods/Headers/Public/RxLibrary/NSEnumerator+GRXUtil.h

-../../../../../../RxLibrary/NSEnumerator+GRXUtil.h
\ No newline at end of file

src/objective-c/examples/Sample/Pods/Local Podspecs/GRPCClient.podspec

-Pod::Spec.new do |s|
-  s.name         = 'GRPCClient'
-  s.version      = '0.0.1'
-  s.summary      = 'Generic gRPC client library for iOS'
-  s.author = {
-    'Jorge Canizales' => 'jcanizales@google.com'
-  }
-  s.source_files = '*.{h,m}', 'private/*.{h,m}'
-  s.private_header_files = 'private/*.h'
-  s.platform = :ios
-  s.ios.deployment_target = '6.0'
-  s.requires_arc = true
-  s.dependency 'RxLibrary', '~> 0.0'
-end

src/objective-c/examples/Sample/Pods/Local Podspecs/RxLibrary.podspec

-Pod::Spec.new do |s|
-  s.name         = 'RxLibrary'
-  s.version      = '0.0.1'
-  s.summary      = 'Reactive Extensions library for iOS'
-  s.author = {
-    'Jorge Canizales' => 'jcanizales@google.com'
-  }
-  s.source_files = '*.{h,m}', 'transformations/*.{h,m}', 'private/*.{h,m}'
-  s.private_header_files = 'private/*.h'
-  s.platform = :ios
-  s.ios.deployment_target = '6.0'
-  s.requires_arc = true
-end

src/objective-c/examples/Sample/Pods/Manifest.lock

-PODS:
-  - GRPCClient (0.0.1):
-    - RxLibrary (~> 0.0)
-  - RxLibrary (0.0.1)
-
-DEPENDENCIES:
-  - GRPCClient (from `../../GRPCClient`)
-  - RxLibrary (from `../../RxLibrary`)
-
-EXTERNAL SOURCES:
-  GRPCClient:
-    :path: ../../GRPCClient
-  RxLibrary:
-    :path: ../../RxLibrary
-
-SPEC CHECKSUMS:
-  GRPCClient: 05c58faab99661384178bb7c5f93b60c2bfc89f8
-  RxLibrary: 70cfcf1573ec16a375b4fe61d976a3188aab9303
-
-COCOAPODS: 0.35.0

src/objective-c/examples/Sample/Pods/Target Support Files/Pods-GRPCClient/Pods-GRPCClient-Private.xcconfig

-#include "Pods-GRPCClient.xcconfig"
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Build" "${PODS_ROOT}/Headers/Build/GRPCClient" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/GRPCClient" "${PODS_ROOT}/Headers/Public/RxLibrary"
-OTHER_LDFLAGS = -ObjC
-PODS_ROOT = ${SRCROOT}
\ No newline at end of file

src/objective-c/examples/Sample/Pods/Target Support Files/Pods-GRPCClient/Pods-GRPCClient-dummy.m

-#import <Foundation/Foundation.h>
-@interface PodsDummy_Pods_GRPCClient : NSObject
-@end
-@implementation PodsDummy_Pods_GRPCClient
-@end

src/objective-c/examples/Sample/Pods/Target Support Files/Pods-GRPCClient/Pods-GRPCClient-prefix.pch

-#ifdef __OBJC__
-#import <UIKit/UIKit.h>
-#endif
-
-#import "Pods-environment.h"

src/objective-c/examples/Sample/Pods/Target Support Files/Pods-RxLibrary/Pods-RxLibrary-Private.xcconfig

-#include "Pods-RxLibrary.xcconfig"
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Build" "${PODS_ROOT}/Headers/Build/RxLibrary" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/GRPCClient" "${PODS_ROOT}/Headers/Public/RxLibrary"
-OTHER_LDFLAGS = -ObjC
-PODS_ROOT = ${SRCROOT}
\ No newline at end of file