diff options
author | Jorge Canizales <jcanizales@google.com> | 2015-02-27 01:22:41 -0800 |
---|---|---|
committer | Jorge Canizales <jcanizales@google.com> | 2015-04-21 09:49:53 -0700 |
commit | c2d7ecb6993b963cfce103fb7ea3270487e1a58c (patch) | |
tree | c2803c2a42cec4b4317796b1151c1dd32fe6ce29 /src/objective-c/GRPCClient | |
parent | 5b4cffc8a65cd57f659ce39ffc1bdc8c2df3d390 (diff) |
Working podspecs for gRPC core & wrapper
- Moves them to the root of the repo.
- Makes them pass lint (except for the release tag warning).
- Includes the script to rename time.h and string.h in the spec.
- Fixes the #includes in the wrapper files.
Diffstat (limited to 'src/objective-c/GRPCClient')
-rw-r--r-- | src/objective-c/GRPCClient/GRPCCall.m | 4 | ||||
-rw-r--r-- | src/objective-c/GRPCClient/GRPCClient.podspec | 14 | ||||
-rw-r--r-- | src/objective-c/GRPCClient/private/GRPCChannel.m | 2 | ||||
-rw-r--r-- | src/objective-c/GRPCClient/private/GRPCCompletionQueue.m | 2 | ||||
-rw-r--r-- | src/objective-c/GRPCClient/private/NSData+GRPC.m | 2 |
5 files changed, 5 insertions, 19 deletions
diff --git a/src/objective-c/GRPCClient/GRPCCall.m b/src/objective-c/GRPCClient/GRPCCall.m index f246b81e63..989ce390e2 100644 --- a/src/objective-c/GRPCClient/GRPCCall.m +++ b/src/objective-c/GRPCClient/GRPCCall.m @@ -33,8 +33,8 @@ #import "GRPCCall.h" -#include <grpc.h> -#include <support/time.h> +#include <grpc/grpc.h> +#include <grpc/support/grpc_time.h> #import "GRPCMethodName.h" #import "private/GRPCChannel.h" diff --git a/src/objective-c/GRPCClient/GRPCClient.podspec b/src/objective-c/GRPCClient/GRPCClient.podspec deleted file mode 100644 index a34c50b54e..0000000000 --- a/src/objective-c/GRPCClient/GRPCClient.podspec +++ /dev/null @@ -1,14 +0,0 @@ -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 diff --git a/src/objective-c/GRPCClient/private/GRPCChannel.m b/src/objective-c/GRPCClient/private/GRPCChannel.m index c8fa69ef91..7ddc01dc24 100644 --- a/src/objective-c/GRPCClient/private/GRPCChannel.m +++ b/src/objective-c/GRPCClient/private/GRPCChannel.m @@ -33,7 +33,7 @@ #import "GRPCChannel.h" -#import <grpc.h> +#import <grpc/grpc.h> @implementation GRPCChannel diff --git a/src/objective-c/GRPCClient/private/GRPCCompletionQueue.m b/src/objective-c/GRPCClient/private/GRPCCompletionQueue.m index bc2a824a6b..b98e8ea439 100644 --- a/src/objective-c/GRPCClient/private/GRPCCompletionQueue.m +++ b/src/objective-c/GRPCClient/private/GRPCCompletionQueue.m @@ -33,7 +33,7 @@ #import "GRPCCompletionQueue.h" -#import <grpc.h> +#import <grpc/grpc.h> @implementation GRPCCompletionQueue diff --git a/src/objective-c/GRPCClient/private/NSData+GRPC.m b/src/objective-c/GRPCClient/private/NSData+GRPC.m index f885e9db9c..5ab16d9d34 100644 --- a/src/objective-c/GRPCClient/private/NSData+GRPC.m +++ b/src/objective-c/GRPCClient/private/NSData+GRPC.m @@ -33,7 +33,7 @@ #import "NSData+GRPC.h" -#include <byte_buffer.h> +#include <grpc/byte_buffer.h> #include <string.h> // TODO(jcanizales): Move these two incantations to the C library. |