diff options
-rw-r--r-- | include/grpc++/client_context.h | 2 | ||||
-rw-r--r-- | include/grpc++/security/credentials.h | 4 | ||||
-rw-r--r-- | src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/project.pbxproj | 21 |
3 files changed, 22 insertions, 5 deletions
diff --git a/include/grpc++/client_context.h b/include/grpc++/client_context.h index 8e7c3579e3..7a20ffa005 100644 --- a/include/grpc++/client_context.h +++ b/include/grpc++/client_context.h @@ -244,7 +244,7 @@ class ClientContext { /// client’s identity, role, or whether it is authorized to make a particular /// call. /// - /// \see https://github.com/grpc/grpc/blob/master/doc/grpc-auth-support.md + /// \see http://www.grpc.io/docs/guides/auth.html void set_credentials(const std::shared_ptr<CallCredentials>& creds) { creds_ = creds; } diff --git a/include/grpc++/security/credentials.h b/include/grpc++/security/credentials.h index e5652dc184..785675f406 100644 --- a/include/grpc++/security/credentials.h +++ b/include/grpc++/security/credentials.h @@ -55,7 +55,7 @@ class SecureCallCredentials; /// It can make various assertions, e.g., about the client’s identity, role /// for all the calls on that channel. /// -/// \see https://github.com/grpc/grpc/blob/master/doc/grpc-auth-support.md +/// \see http://www.grpc.io/docs/guides/auth.html class ChannelCredentials : public GrpcLibrary { public: ~ChannelCredentials() GRPC_OVERRIDE; @@ -80,7 +80,7 @@ class ChannelCredentials : public GrpcLibrary { /// A call credentials object encapsulates the state needed by a client to /// authenticate with a server for a given call on a channel. /// -/// \see https://github.com/grpc/grpc/blob/master/doc/grpc-auth-support.md +/// \see http://www.grpc.io/docs/guides/auth.html class CallCredentials : public GrpcLibrary { public: ~CallCredentials() GRPC_OVERRIDE; diff --git a/src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/project.pbxproj b/src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/project.pbxproj index cfccdd453f..2f5716082b 100644 --- a/src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/project.pbxproj +++ b/src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/project.pbxproj @@ -107,6 +107,7 @@ 633BFFBF1B950B210007E424 /* Frameworks */, 633BFFC01B950B210007E424 /* Resources */, AC2F6F9AB1C090BB0BEE6E4D /* Copy Pods Resources */, + A1738A987353B0BF2C64F0F7 /* Embed Pods Frameworks */, ); buildRules = ( ); @@ -123,6 +124,7 @@ 633BFFBA1B950B210007E424 /* Project object */ = { isa = PBXProject; attributes = { + LastSwiftUpdateCheck = 0710; LastUpgradeCheck = 0640; ORGANIZATIONNAME = gRPC; TargetAttributes = { @@ -177,6 +179,21 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; + A1738A987353B0BF2C64F0F7 /* Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Embed Pods Frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; AC2F6F9AB1C090BB0BEE6E4D /* Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -310,7 +327,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h"; - USER_HEADER_SEARCH_PATHS = "Pods/**"; + USER_HEADER_SEARCH_PATHS = ""; }; name = Debug; }; @@ -323,7 +340,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h"; - USER_HEADER_SEARCH_PATHS = "Pods/**"; + USER_HEADER_SEARCH_PATHS = ""; }; name = Release; }; |