Skip to content
Snippets Groups Projects
Commit de733bd7 authored by Makarand Dharmapurikar's avatar Makarand Dharmapurikar
Browse files

Cosmetic changes to address feedback.

parent 9b5f6401
No related branches found
No related tags found
No related merge requests found
# # Copyright 2016, Google Inc.
# Be sure to run `pod spec lint cronet.podspec' to ensure this is a # All rights reserved.
# valid spec and to remove all comments including this before submitting the spec. #
# # Redistribution and use in source and binary forms, with or without
# To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html # modification, are permitted provided that the following conditions are
# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/ # met:
# #
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Pod::Spec.new do |s|
# ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
#
# These will help people to find your library, and whilst it
# can feel like a chore to fill in it's definitely to your advantage. The
# summary should be tweet-length, and the description more in depth.
#
Pod::Spec.new do |s|
s.name = "CronetFramework" s.name = "CronetFramework"
s.version = "0.0.2" s.version = "0.0.2"
s.summary = "Cronet, precompiled and used as a framework." s.summary = "Cronet, precompiled and used as a framework."
# This description is used to generate tags and improve search results.
# * Think: What does it do? Why did you write it? What is the focus?
# * Try to keep it short, snappy and to the point.
# * Write the description between the DESC delimiters below.
# * Finally, don't worry about the indent, CocoaPods strips it!
#s.description = <<-DESC
# DESC
s.homepage = "http://chromium.org" s.homepage = "http://chromium.org"
# s.screenshots = "www.example.com/screenshots_1.gif", "www.example.com/screenshots_2.gif"
# ――― Spec License ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
#
# Licensing your code is important. See http://choosealicense.com for more info.
# CocoaPods will detect a license file if there is a named LICENSE*
# Popular ones are 'MIT', 'BSD' and 'Apache License, Version 2.0'.
#
s.license = { :type => 'BSD' } s.license = { :type => 'BSD' }
s.vendored_framework = "Cronet.framework" s.vendored_framework = "Cronet.framework"
# ――― Author Metadata ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
#
# Specify the authors of the library, with email addresses. Email addresses
# of the authors are extracted from the SCM log. E.g. $ git log. CocoaPods also
# accepts just a name if you'd rather not provide an email address.
#
# Specify a social_media_url where others can refer to, for example a twitter
# profile URL.
#
s.author = "" s.author = ""
# Or just: s.author = ""
# s.authors = { "" => "makarandd@google.com" }
# s.social_media_url = "http://twitter.com/"
# ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
#
# If this Pod runs only on iOS or OS X, then specify the platform and
# the deployment target. You can optionally include the target after the platform.
#
# s.platform = :ios
# s.platform = :ios, "5.0"
# When using multiple platforms
s.ios.deployment_target = "8.0" s.ios.deployment_target = "8.0"
# s.osx.deployment_target = "10.7"
# s.watchos.deployment_target = "2.0"
# s.tvos.deployment_target = "9.0"
# ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
#
# Specify the location from where the source should be retrieved.
# Supports git, hg, bzr, svn and HTTP.
#
s.source = { :http => 'https://storage.googleapis.com/grpc-precompiled-binaries/cronet/Cronet.framework.zip' } s.source = { :http => 'https://storage.googleapis.com/grpc-precompiled-binaries/cronet/Cronet.framework.zip' }
# ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
#
# CocoaPods is smart about how it includes source code. For source files
# giving a folder will include any swift, h, m, mm, c & cpp files.
# For header files it will include any header in the folder.
# Not including the public_header_files will make all headers public.
#
#s.public_header_files = "/*.h"
# s.public_header_files = "Classes/**/*.h"
# ――― Resources ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
#
# A list of resources included with the Pod. These are copied into the
# target bundle with a build phase script. Anything else will be cleaned.
# You can preserve files from being cleaned, please don't preserve
# non-essential files like tests, examples and documentation.
#
# s.resource = "icon.png"
# s.resources = "Resources/*.png"
# s.preserve_paths = "FilesToSave", "MoreFilesToSave"
s.preserve_paths = "Cronet.framework" s.preserve_paths = "Cronet.framework"
s.public_header_files = "Cronet.framework/Headers/**/*{.h}" s.public_header_files = "Cronet.framework/Headers/**/*{.h}"
# ――― Project Linking ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
#
# Link your library with frameworks, or libraries. Libraries do not include
# the lib prefix of their name.
#
# s.framework = "SomeFramework"
# s.frameworks = "SomeFramework", "AnotherFramework"
# s.library = "iconv"
# s.libraries = "iconv", "xml2"
# ――― Project Settings ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
#
# If your library depends on compiler flags you can set them in the xcconfig hash
# where they will only apply to your library. If you depend on other Podspecs
# you can include multiple dependencies to ensure it works.
# s.requires_arc = true
# s.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" }
# s.dependency "JSONKit", "~> 1.4"
end end
...@@ -30,15 +30,17 @@ ...@@ -30,15 +30,17 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
#import <Cronet/Cronet.h>
#import "GRPCCall.h" #import "GRPCCall.h"
/** /**
* TODOTODOTODO: Description * Methods for using cronet transport.
*/ */
@interface GRPCCall (Cronet) @interface GRPCCall (Cronet)
+(void) setUseCronet:(BOOL) useCronet +(void) setUseCronet:(BOOL) useCronet
:(void *)cronet_engine; :(cronet_engine *)cronet_engine;
+(void *)getCronetEngine; +(void *)getCronetEngine;
... ...
......
...@@ -33,13 +33,13 @@ ...@@ -33,13 +33,13 @@
#import "GRPCCall+Cronet.h" #import "GRPCCall+Cronet.h"
static BOOL use_cronet = false; static BOOL use_cronet = NO;
static void *g_cronet_engine; static void *g_cronet_engine;
@implementation GRPCCall (Cronet) @implementation GRPCCall (Cronet)
+ (void)setUseCronet:(BOOL)useCronet + (void)setUseCronet:(BOOL)useCronet
:(void *)cronet_engine { :(cronet_engine *)cronet_engine {
use_cronet = useCronet; use_cronet = useCronet;
g_cronet_engine = cronet_engine; g_cronet_engine = cronet_engine;
} }
... ...
......
File changed. Contains only whitespace changes. Show whitespace changes.
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/string_util.h> #include <grpc/support/string_util.h>
#import <Cronet/Cronet.h>
#import <GRPCClient/GRPCCall+Cronet.h> #import <GRPCClient/GRPCCall+Cronet.h>
#import "GRPCCompletionQueue.h" #import "GRPCCompletionQueue.h"
...@@ -100,8 +102,8 @@ grpc_channel_args * buildChannelArgs(NSDictionary *dictionary) { ...@@ -100,8 +102,8 @@ grpc_channel_args * buildChannelArgs(NSDictionary *dictionary) {
grpc_channel_args *_channelArgs; grpc_channel_args *_channelArgs;
} }
- (instancetype)initWithHostUsingCronet:(NSString *)host - (instancetype)initWithHost:(NSString *)host
engine:(void *)engine cronetEngine:(cronet_engine *)cronetEngine
channelArgs:(NSDictionary *)channelArgs { channelArgs:(NSDictionary *)channelArgs {
if (!host) { if (!host) {
[NSException raise:NSInvalidArgumentException format:@"host argument missing"]; [NSException raise:NSInvalidArgumentException format:@"host argument missing"];
...@@ -110,7 +112,7 @@ grpc_channel_args * buildChannelArgs(NSDictionary *dictionary) { ...@@ -110,7 +112,7 @@ grpc_channel_args * buildChannelArgs(NSDictionary *dictionary) {
if (self = [super init]) { if (self = [super init]) {
_channelArgs = buildChannelArgs(channelArgs); _channelArgs = buildChannelArgs(channelArgs);
_host = [host copy]; _host = [host copy];
_unmanagedChannel = grpc_cronet_secure_channel_create(engine, _host.UTF8String, _channelArgs, _unmanagedChannel = grpc_cronet_secure_channel_create(cronetEngine, _host.UTF8String, _channelArgs,
NULL); NULL);
} }
...@@ -154,10 +156,11 @@ grpc_channel_args * buildChannelArgs(NSDictionary *dictionary) { ...@@ -154,10 +156,11 @@ grpc_channel_args * buildChannelArgs(NSDictionary *dictionary) {
channelArgs:(NSDictionary *)channelArgs { channelArgs:(NSDictionary *)channelArgs {
void *engine = [GRPCCall getCronetEngine]; void *engine = [GRPCCall getCronetEngine];
if (!engine) { if (!engine) {
[NSException raise:NSInvalidArgumentException format:@"cronet_engine is NULL. Set it first."]; [NSException raise:NSInvalidArgumentException
format:@"cronet_engine is NULL. Set it first."];
return nil; return nil;
} }
return [[GRPCChannel alloc] initWithHostUsingCronet:host engine:engine channelArgs:channelArgs]; return [[GRPCChannel alloc] initWithHost:host cronetEngine:engine channelArgs:channelArgs];
} }
+ (GRPCChannel *)secureChannelWithHost:(NSString *)host { + (GRPCChannel *)secureChannelWithHost:(NSString *)host {
... ...
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <grpc/status.h> #include <grpc/status.h>
#import <Cronet/Cronet.h>
#import <GRPCClient/GRPCCall+Tests.h> #import <GRPCClient/GRPCCall+Tests.h>
#import <GRPCClient/GRPCCall+Cronet.h> #import <GRPCClient/GRPCCall+Cronet.h>
#import <ProtoRPC/ProtoRPC.h> #import <ProtoRPC/ProtoRPC.h>
...@@ -44,7 +45,6 @@ ...@@ -44,7 +45,6 @@
#import <RemoteTest/Test.pbrpc.h> #import <RemoteTest/Test.pbrpc.h>
#import <RxLibrary/GRXBufferedPipe.h> #import <RxLibrary/GRXBufferedPipe.h>
#import <RxLibrary/GRXWriter+Immediate.h> #import <RxLibrary/GRXWriter+Immediate.h>
#import <Cronet/Cronet.h>
// Convenience constructors for the generated proto messages: // Convenience constructors for the generated proto messages:
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment