diff --git a/gRPC.podspec b/gRPC.podspec index 120a23ffcbc..1ba1ac974ba 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -70,7 +70,7 @@ Pod::Spec.new do |s| "src/objective-c/GRPCClient/GRPCCall+Tests.h", "src/objective-c/GRPCClient/GRPCCallLegacy.h", "src/objective-c/GRPCClient/GRPCTypes.h", - "src/objective-c/GRPCClient/GRPCTypes.m" + "src/objective-c/GRPCClient/GRPCTypes.mm" ss.dependency "gRPC-RxLibrary/Interface", version s.ios.deployment_target = '10.0' @@ -91,19 +91,19 @@ Pod::Spec.new do |s| 'src/objective-c/GRPCClient/version.h' ss.source_files = 'src/objective-c/GRPCClient/GRPCCall.h', - 'src/objective-c/GRPCClient/GRPCCall.m', + 'src/objective-c/GRPCClient/GRPCCall.mm', 'src/objective-c/GRPCClient/GRPCCall+Interceptor.h', - 'src/objective-c/GRPCClient/GRPCCall+Interceptor.m', + 'src/objective-c/GRPCClient/GRPCCall+Interceptor.mm', 'src/objective-c/GRPCClient/GRPCCallOptions.h', - 'src/objective-c/GRPCClient/GRPCCallOptions.m', + 'src/objective-c/GRPCClient/GRPCCallOptions.mm', 'src/objective-c/GRPCClient/GRPCDispatchable.h', 'src/objective-c/GRPCClient/GRPCInterceptor.h', - 'src/objective-c/GRPCClient/GRPCInterceptor.m', + 'src/objective-c/GRPCClient/GRPCInterceptor.mm', 'src/objective-c/GRPCClient/GRPCTransport.h', - 'src/objective-c/GRPCClient/GRPCTransport.m', + 'src/objective-c/GRPCClient/GRPCTransport.mm', 'src/objective-c/GRPCClient/internal/*.h', 'src/objective-c/GRPCClient/private/GRPCTransport+Private.h', - 'src/objective-c/GRPCClient/private/GRPCTransport+Private.m', + 'src/objective-c/GRPCClient/private/GRPCTransport+Private.mm', 'src/objective-c/GRPCClient/version.h' ss.dependency "#{s.name}/Interface-Legacy", version @@ -123,18 +123,18 @@ Pod::Spec.new do |s| 'src/objective-c/GRPCClient/GRPCCall+Tests.h', 'src/objective-c/GRPCClient/GRPCCall+ChannelArg.h' ss.private_header_files = 'src/objective-c/GRPCClient/private/GRPCCore/*.h' - ss.source_files = 'src/objective-c/GRPCClient/private/GRPCCore/*.{h,m}', + ss.source_files = 'src/objective-c/GRPCClient/private/GRPCCore/*.{h,mm}', 'src/objective-c/GRPCClient/GRPCCall+ChannelArg.h', - 'src/objective-c/GRPCClient/GRPCCall+ChannelArg.m', + 'src/objective-c/GRPCClient/GRPCCall+ChannelArg.mm', 'src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.h', - 'src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.m', + 'src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.mm', 'src/objective-c/GRPCClient/GRPCCall+Cronet.h', - 'src/objective-c/GRPCClient/GRPCCall+Cronet.m', + 'src/objective-c/GRPCClient/GRPCCall+Cronet.mm', 'src/objective-c/GRPCClient/GRPCCall+OAuth2.h', - 'src/objective-c/GRPCClient/GRPCCall+OAuth2.m', + 'src/objective-c/GRPCClient/GRPCCall+OAuth2.mm', 'src/objective-c/GRPCClient/GRPCCall+Tests.h', - 'src/objective-c/GRPCClient/GRPCCall+Tests.m', - 'src/objective-c/GRPCClient/GRPCCallLegacy.m' + 'src/objective-c/GRPCClient/GRPCCall+Tests.mm', + 'src/objective-c/GRPCClient/GRPCCallLegacy.mm' # Certificates, to be able to establish TLS connections: ss.resource_bundles = { 'gRPCCertificates' => ['etc/roots.pem'] } @@ -154,8 +154,8 @@ Pod::Spec.new do |s| ss.header_mappings_dir = 'src/objective-c/GRPCClient' ss.source_files = 'src/objective-c/GRPCClient/GRPCCall+Cronet.h', - 'src/objective-c/GRPCClient/GRPCCall+Cronet.m', - 'src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/*.{h,m}' + 'src/objective-c/GRPCClient/GRPCCall+Cronet.mm', + 'src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/*.{h,mm}' ss.dependency "#{s.name}/GRPCCore", version ss.dependency 'gRPC-Core/Cronet-Implementation', version ss.dependency 'CronetFramework' @@ -176,7 +176,7 @@ Pod::Spec.new do |s| s.subspec 'InternalTesting' do |ss| ss.dependency "#{s.name}/GRPCCore", version ss.public_header_files = 'src/objective-c/GRPCClient/internal_testing/*.h' - ss.source_files = 'src/objective-c/GRPCClient/internal_testing/*.{h,m}' + ss.source_files = 'src/objective-c/GRPCClient/internal_testing/*.{h,mm}' ss.header_mappings_dir = 'src/objective-c/GRPCClient' s.ios.deployment_target = '10.0' diff --git a/src/objective-c/BUILD b/src/objective-c/BUILD index 79509248d67..575c963674f 100644 --- a/src/objective-c/BUILD +++ b/src/objective-c/BUILD @@ -78,7 +78,7 @@ grpc_objc_library( grpc_objc_library( name = "grpc_objc_interface_types", srcs = [ - "GRPCClient/GRPCTypes.m", + "GRPCClient/GRPCTypes.mm", ], hdrs = [ "GRPCClient/GRPCTypes.h", @@ -88,12 +88,12 @@ grpc_objc_library( grpc_objc_library( name = "grpc_objc_interface", srcs = [ - "GRPCClient/GRPCCall.m", - "GRPCClient/GRPCCall+Interceptor.m", - "GRPCClient/GRPCCallOptions.m", - "GRPCClient/GRPCInterceptor.m", - "GRPCClient/GRPCTransport.m", - "GRPCClient/private/GRPCTransport+Private.m", + "GRPCClient/GRPCCall.mm", + "GRPCClient/GRPCCall+Interceptor.mm", + "GRPCClient/GRPCCallOptions.mm", + "GRPCClient/GRPCInterceptor.mm", + "GRPCClient/GRPCTransport.mm", + "GRPCClient/private/GRPCTransport+Private.mm", ], hdrs = [ "GRPCClient/GRPCCall.h", @@ -117,13 +117,13 @@ grpc_objc_library( grpc_objc_library( name = "grpc_objc_client", srcs = [ - "GRPCClient/GRPCCall+ChannelArg.m", - "GRPCClient/GRPCCall+ChannelCredentials.m", - "GRPCClient/GRPCCall+Cronet.m", - "GRPCClient/GRPCCall+OAuth2.m", - "GRPCClient/GRPCCall+Tests.m", - "GRPCClient/GRPCCallLegacy.m", - ] + glob(["GRPCClient/private/GRPCCore/*.m"]), + "GRPCClient/GRPCCall+ChannelArg.mm", + "GRPCClient/GRPCCall+ChannelCredentials.mm", + "GRPCClient/GRPCCall+Cronet.mm", + "GRPCClient/GRPCCall+OAuth2.mm", + "GRPCClient/GRPCCall+Tests.mm", + "GRPCClient/GRPCCallLegacy.mm", + ] + glob(["GRPCClient/private/GRPCCore/*.mm"]), hdrs = [ "GRPCClient/GRPCCall+ChannelArg.h", "GRPCClient/GRPCCall+ChannelCredentials.h", @@ -209,14 +209,14 @@ apple_resource_bundle( grpc_objc_library( name = "grpc_objc_client_core_internal_testing", srcs = [ - "GRPCClient/GRPCCall+ChannelArg.m", - "GRPCClient/GRPCCall+ChannelCredentials.m", - "GRPCClient/GRPCCall+Cronet.m", - "GRPCClient/GRPCCall+OAuth2.m", - "GRPCClient/GRPCCall+Tests.m", - "GRPCClient/GRPCCallLegacy.m", - "GRPCClient/internal_testing/GRPCCall+InternalTests.m", - ] + glob(["GRPCClient/private/GRPCCore/*.m"]), + "GRPCClient/GRPCCall+ChannelArg.mm", + "GRPCClient/GRPCCall+ChannelCredentials.mm", + "GRPCClient/GRPCCall+Cronet.mm", + "GRPCClient/GRPCCall+OAuth2.mm", + "GRPCClient/GRPCCall+Tests.mm", + "GRPCClient/GRPCCallLegacy.mm", + "GRPCClient/internal_testing/GRPCCall+InternalTests.mm", + ] + glob(["GRPCClient/private/GRPCCore/*.mm"]), hdrs = [ "GRPCClient/GRPCCall+ChannelArg.h", "GRPCClient/GRPCCall+ChannelCredentials.h", @@ -242,7 +242,7 @@ grpc_objc_library( # TODO: Enable this again once @CronetFramework is working #grpc_objc_library( # name = "grpc_objc_client_core_cronet_testing", -# srcs = glob(["GRPCClient/private/GRPCCore/GRPCCoreCronet/*.m"]), +# srcs = glob(["GRPCClient/private/GRPCCore/GRPCCoreCronet/*.mm"]), # hdrs = glob(["GRPCClient/private/GRPCCore/GRPCCoreCronet/*.h"]), # deps = [ # ":grpc_objc_client_core_internal_testing", diff --git a/src/objective-c/BoringSSL-GRPC.podspec b/src/objective-c/BoringSSL-GRPC.podspec index 10a15aaf119..6537a0a70a3 100644 --- a/src/objective-c/BoringSSL-GRPC.podspec +++ b/src/objective-c/BoringSSL-GRPC.podspec @@ -117,6 +117,7 @@ Pod::Spec.new do |s| # making the linter happy. s.subspec 'Interface' do |ss| ss.header_mappings_dir = 'src/include/openssl' + ss.private_header_files = 'src/include/openssl/time.h' ss.source_files = 'src/include/openssl/*.h' end s.subspec 'Implementation' do |ss| diff --git a/src/objective-c/GRPCClient/GRPCCall+ChannelArg.m b/src/objective-c/GRPCClient/GRPCCall+ChannelArg.mm similarity index 100% rename from src/objective-c/GRPCClient/GRPCCall+ChannelArg.m rename to src/objective-c/GRPCClient/GRPCCall+ChannelArg.mm diff --git a/src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.m b/src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.mm similarity index 100% rename from src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.m rename to src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.mm diff --git a/src/objective-c/GRPCClient/GRPCCall+Cronet.m b/src/objective-c/GRPCClient/GRPCCall+Cronet.mm similarity index 100% rename from src/objective-c/GRPCClient/GRPCCall+Cronet.m rename to src/objective-c/GRPCClient/GRPCCall+Cronet.mm diff --git a/src/objective-c/GRPCClient/GRPCCall+GID.m b/src/objective-c/GRPCClient/GRPCCall+GID.mm similarity index 100% rename from src/objective-c/GRPCClient/GRPCCall+GID.m rename to src/objective-c/GRPCClient/GRPCCall+GID.mm diff --git a/src/objective-c/GRPCClient/GRPCCall+Interceptor.m b/src/objective-c/GRPCClient/GRPCCall+Interceptor.mm similarity index 100% rename from src/objective-c/GRPCClient/GRPCCall+Interceptor.m rename to src/objective-c/GRPCClient/GRPCCall+Interceptor.mm diff --git a/src/objective-c/GRPCClient/GRPCCall+OAuth2.m b/src/objective-c/GRPCClient/GRPCCall+OAuth2.mm similarity index 100% rename from src/objective-c/GRPCClient/GRPCCall+OAuth2.m rename to src/objective-c/GRPCClient/GRPCCall+OAuth2.mm diff --git a/src/objective-c/GRPCClient/GRPCCall+Tests.m b/src/objective-c/GRPCClient/GRPCCall+Tests.mm similarity index 100% rename from src/objective-c/GRPCClient/GRPCCall+Tests.m rename to src/objective-c/GRPCClient/GRPCCall+Tests.mm diff --git a/src/objective-c/GRPCClient/GRPCCall.m b/src/objective-c/GRPCClient/GRPCCall.mm similarity index 100% rename from src/objective-c/GRPCClient/GRPCCall.m rename to src/objective-c/GRPCClient/GRPCCall.mm diff --git a/src/objective-c/GRPCClient/GRPCCallLegacy.m b/src/objective-c/GRPCClient/GRPCCallLegacy.mm similarity index 99% rename from src/objective-c/GRPCClient/GRPCCallLegacy.m rename to src/objective-c/GRPCClient/GRPCCallLegacy.mm index b3cb11a3222..aeb9cbe923c 100644 --- a/src/objective-c/GRPCClient/GRPCCallLegacy.m +++ b/src/objective-c/GRPCClient/GRPCCallLegacy.mm @@ -598,9 +598,9 @@ static NSString *const kBearerPrefix = @"Bearer "; } if (tokenProvider != nil) { - __weak typeof(self) weakSelf = self; + __weak auto weakSelf = self; [tokenProvider getTokenWithHandler:^(NSString *token) { - __strong typeof(self) strongSelf = weakSelf; + __strong auto strongSelf = weakSelf; if (strongSelf) { BOOL startCall = NO; @synchronized(strongSelf) { diff --git a/src/objective-c/GRPCClient/GRPCCallOptions.m b/src/objective-c/GRPCClient/GRPCCallOptions.mm similarity index 100% rename from src/objective-c/GRPCClient/GRPCCallOptions.m rename to src/objective-c/GRPCClient/GRPCCallOptions.mm diff --git a/src/objective-c/GRPCClient/GRPCInterceptor.m b/src/objective-c/GRPCClient/GRPCInterceptor.mm similarity index 100% rename from src/objective-c/GRPCClient/GRPCInterceptor.m rename to src/objective-c/GRPCClient/GRPCInterceptor.mm diff --git a/src/objective-c/GRPCClient/GRPCTransport.m b/src/objective-c/GRPCClient/GRPCTransport.mm similarity index 100% rename from src/objective-c/GRPCClient/GRPCTransport.m rename to src/objective-c/GRPCClient/GRPCTransport.mm diff --git a/src/objective-c/GRPCClient/GRPCTypes.h b/src/objective-c/GRPCClient/GRPCTypes.h index 2aa9fd7945b..75702ddccf4 100644 --- a/src/objective-c/GRPCClient/GRPCTypes.h +++ b/src/objective-c/GRPCClient/GRPCTypes.h @@ -171,7 +171,7 @@ extern NSString* _Nonnull const kGRPCHeadersKey; extern NSString* _Nonnull const kGRPCTrailersKey; /** The id of a transport implementation. */ -typedef char* _Nonnull GRPCTransportID; +typedef const char* _Nonnull GRPCTransportID; /** * Implement this protocol to provide a token to gRPC when a call is initiated. diff --git a/src/objective-c/GRPCClient/GRPCTypes.m b/src/objective-c/GRPCClient/GRPCTypes.mm similarity index 100% rename from src/objective-c/GRPCClient/GRPCTypes.m rename to src/objective-c/GRPCClient/GRPCTypes.mm diff --git a/src/objective-c/GRPCClient/internal_testing/GRPCCall+InternalTests.m b/src/objective-c/GRPCClient/internal_testing/GRPCCall+InternalTests.mm similarity index 100% rename from src/objective-c/GRPCClient/internal_testing/GRPCCall+InternalTests.m rename to src/objective-c/GRPCClient/internal_testing/GRPCCall+InternalTests.mm diff --git a/src/objective-c/GRPCClient/private/GRPCCore/ChannelArgsUtil.m b/src/objective-c/GRPCClient/private/GRPCCore/ChannelArgsUtil.mm similarity index 100% rename from src/objective-c/GRPCClient/private/GRPCCore/ChannelArgsUtil.m rename to src/objective-c/GRPCClient/private/GRPCCore/ChannelArgsUtil.mm diff --git a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCallInternal.m b/src/objective-c/GRPCClient/private/GRPCCore/GRPCCallInternal.mm similarity index 100% rename from src/objective-c/GRPCClient/private/GRPCCore/GRPCCallInternal.m rename to src/objective-c/GRPCClient/private/GRPCCore/GRPCCallInternal.mm diff --git a/src/objective-c/GRPCClient/private/GRPCCore/GRPCChannel.m b/src/objective-c/GRPCClient/private/GRPCCore/GRPCChannel.mm similarity index 99% rename from src/objective-c/GRPCClient/private/GRPCCore/GRPCChannel.m rename to src/objective-c/GRPCClient/private/GRPCCore/GRPCChannel.mm index 5727f01c96a..7f29485fee3 100644 --- a/src/objective-c/GRPCClient/private/GRPCCore/GRPCChannel.m +++ b/src/objective-c/GRPCClient/private/GRPCCore/GRPCChannel.mm @@ -127,7 +127,7 @@ [NSNumber numberWithUnsignedInteger:_callOptions.responseSizeLimit]; } - if (_callOptions.compressionAlgorithm != GRPC_COMPRESS_NONE) { + if (_callOptions.compressionAlgorithm != GRPCCompressNone) { args[@GRPC_COMPRESSION_CHANNEL_DEFAULT_ALGORITHM] = [NSNumber numberWithInteger:_callOptions.compressionAlgorithm]; } diff --git a/src/objective-c/GRPCClient/private/GRPCCore/GRPCChannelPool.m b/src/objective-c/GRPCClient/private/GRPCCore/GRPCChannelPool.mm similarity index 100% rename from src/objective-c/GRPCClient/private/GRPCCore/GRPCChannelPool.m rename to src/objective-c/GRPCClient/private/GRPCCore/GRPCChannelPool.mm diff --git a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCompletionQueue.m b/src/objective-c/GRPCClient/private/GRPCCore/GRPCCompletionQueue.mm similarity index 100% rename from src/objective-c/GRPCClient/private/GRPCCore/GRPCCompletionQueue.m rename to src/objective-c/GRPCClient/private/GRPCCore/GRPCCompletionQueue.mm diff --git a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCoreCronetFactory.m b/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCoreCronetFactory.mm similarity index 100% rename from src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCoreCronetFactory.m rename to src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCoreCronetFactory.mm diff --git a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCronetChannelFactory.m b/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCronetChannelFactory.mm similarity index 100% rename from src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCronetChannelFactory.m rename to src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCronetChannelFactory.mm diff --git a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreFactory.m b/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreFactory.mm similarity index 100% rename from src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreFactory.m rename to src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreFactory.mm diff --git a/src/objective-c/GRPCClient/private/GRPCCore/GRPCHost.m b/src/objective-c/GRPCClient/private/GRPCCore/GRPCHost.mm similarity index 100% rename from src/objective-c/GRPCClient/private/GRPCCore/GRPCHost.m rename to src/objective-c/GRPCClient/private/GRPCCore/GRPCHost.mm diff --git a/src/objective-c/GRPCClient/private/GRPCCore/GRPCInsecureChannelFactory.m b/src/objective-c/GRPCClient/private/GRPCCore/GRPCInsecureChannelFactory.mm similarity index 100% rename from src/objective-c/GRPCClient/private/GRPCCore/GRPCInsecureChannelFactory.m rename to src/objective-c/GRPCClient/private/GRPCCore/GRPCInsecureChannelFactory.mm diff --git a/src/objective-c/GRPCClient/private/GRPCCore/GRPCOpBatchLog.m b/src/objective-c/GRPCClient/private/GRPCCore/GRPCOpBatchLog.mm similarity index 100% rename from src/objective-c/GRPCClient/private/GRPCCore/GRPCOpBatchLog.m rename to src/objective-c/GRPCClient/private/GRPCCore/GRPCOpBatchLog.mm diff --git a/src/objective-c/GRPCClient/private/GRPCCore/GRPCRequestHeaders.m b/src/objective-c/GRPCClient/private/GRPCCore/GRPCRequestHeaders.mm similarity index 100% rename from src/objective-c/GRPCClient/private/GRPCCore/GRPCRequestHeaders.m rename to src/objective-c/GRPCClient/private/GRPCCore/GRPCRequestHeaders.mm diff --git a/src/objective-c/GRPCClient/private/GRPCCore/GRPCSecureChannelFactory.m b/src/objective-c/GRPCClient/private/GRPCCore/GRPCSecureChannelFactory.mm similarity index 100% rename from src/objective-c/GRPCClient/private/GRPCCore/GRPCSecureChannelFactory.m rename to src/objective-c/GRPCClient/private/GRPCCore/GRPCSecureChannelFactory.mm diff --git a/src/objective-c/GRPCClient/private/GRPCCore/GRPCWrappedCall.m b/src/objective-c/GRPCClient/private/GRPCCore/GRPCWrappedCall.mm similarity index 97% rename from src/objective-c/GRPCClient/private/GRPCCore/GRPCWrappedCall.m rename to src/objective-c/GRPCClient/private/GRPCCore/GRPCWrappedCall.mm index c54a9b8e29f..687bf9783b2 100644 --- a/src/objective-c/GRPCClient/private/GRPCCore/GRPCWrappedCall.m +++ b/src/objective-c/GRPCClient/private/GRPCCore/GRPCWrappedCall.mm @@ -140,9 +140,9 @@ _op.data.recv_initial_metadata.recv_initial_metadata = &_headers; if (handler) { // Prevent reference cycle with _handler - __weak typeof(self) weakSelf = self; + __weak auto weakSelf = self; _handler = ^{ - __strong typeof(self) strongSelf = weakSelf; + __strong auto strongSelf = weakSelf; if (strongSelf) { NSDictionary *metadata = [NSDictionary grpc_dictionaryFromMetadataArray:strongSelf->_headers]; @@ -174,9 +174,9 @@ _op.data.recv_message.recv_message = &_receivedMessage; if (handler) { // Prevent reference cycle with _handler - __weak typeof(self) weakSelf = self; + __weak auto weakSelf = self; _handler = ^{ - __strong typeof(self) strongSelf = weakSelf; + __strong auto strongSelf = weakSelf; if (strongSelf) { handler(strongSelf->_receivedMessage); } @@ -210,9 +210,9 @@ _op.data.recv_status_on_client.error_string = &_errorString; if (handler) { // Prevent reference cycle with _handler - __weak typeof(self) weakSelf = self; + __weak auto weakSelf = self; _handler = ^{ - __strong typeof(self) strongSelf = weakSelf; + __strong auto strongSelf = weakSelf; if (strongSelf) { char *details = grpc_slice_to_c_string(strongSelf->_details); NSError *error = [NSError grpc_errorFromStatusCode:strongSelf->_statusCode diff --git a/src/objective-c/GRPCClient/private/GRPCCore/NSData+GRPC.m b/src/objective-c/GRPCClient/private/GRPCCore/NSData+GRPC.mm similarity index 100% rename from src/objective-c/GRPCClient/private/GRPCCore/NSData+GRPC.m rename to src/objective-c/GRPCClient/private/GRPCCore/NSData+GRPC.mm diff --git a/src/objective-c/GRPCClient/private/GRPCCore/NSDictionary+GRPC.m b/src/objective-c/GRPCClient/private/GRPCCore/NSDictionary+GRPC.mm similarity index 100% rename from src/objective-c/GRPCClient/private/GRPCCore/NSDictionary+GRPC.m rename to src/objective-c/GRPCClient/private/GRPCCore/NSDictionary+GRPC.mm diff --git a/src/objective-c/GRPCClient/private/GRPCCore/NSError+GRPC.m b/src/objective-c/GRPCClient/private/GRPCCore/NSError+GRPC.mm similarity index 100% rename from src/objective-c/GRPCClient/private/GRPCCore/NSError+GRPC.m rename to src/objective-c/GRPCClient/private/GRPCCore/NSError+GRPC.mm diff --git a/src/objective-c/GRPCClient/private/GRPCTransport+Private.m b/src/objective-c/GRPCClient/private/GRPCTransport+Private.mm similarity index 100% rename from src/objective-c/GRPCClient/private/GRPCTransport+Private.m rename to src/objective-c/GRPCClient/private/GRPCTransport+Private.mm diff --git a/src/objective-c/examples/SwiftUseFrameworks/Podfile b/src/objective-c/examples/SwiftUseFrameworks/Podfile new file mode 100644 index 00000000000..4b74f614705 --- /dev/null +++ b/src/objective-c/examples/SwiftUseFrameworks/Podfile @@ -0,0 +1,19 @@ +source 'https://github.com/CocoaPods/Specs.git' +platform :ios, '10.0' + +# Without this we get linker errors due to files with same names but different paths +# ref: https://github.com/CocoaPods/CocoaPods/issues/8289#issuecomment-1022723820 +install! 'cocoapods', :deterministic_uuids => false + +use_frameworks! + +# Location of gRPC's repo root relative to this file. +GRPC_LOCAL_SRC = '../../../..' + +target 'SwiftUseFrameworks' do + pod 'gRPC', :path => GRPC_LOCAL_SRC + pod 'gRPC-Core', :path => GRPC_LOCAL_SRC + pod 'gRPC-C++', :path => GRPC_LOCAL_SRC + pod 'gRPC-RxLibrary', :path => GRPC_LOCAL_SRC + pod 'BoringSSL-GRPC', :podspec => "#{GRPC_LOCAL_SRC}/src/objective-c" +end diff --git a/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks.xcodeproj/project.pbxproj b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks.xcodeproj/project.pbxproj new file mode 100644 index 00000000000..7d139519db8 --- /dev/null +++ b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks.xcodeproj/project.pbxproj @@ -0,0 +1,366 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 56; + objects = { + +/* Begin PBXBuildFile section */ + 0F54974D2ADC8E6500A6D01F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F54974C2ADC8E6500A6D01F /* AppDelegate.swift */; }; + 0F54974F2ADC8E6500A6D01F /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F54974E2ADC8E6500A6D01F /* SceneDelegate.swift */; }; + 0F5497512ADC8E6500A6D01F /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F5497502ADC8E6500A6D01F /* ViewController.swift */; }; + 0F5497542ADC8E6500A6D01F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0F5497522ADC8E6500A6D01F /* Main.storyboard */; }; + 0F5497562ADC8E6500A6D01F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0F5497552ADC8E6500A6D01F /* Assets.xcassets */; }; + 0F5497592ADC8E6500A6D01F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0F5497572ADC8E6500A6D01F /* LaunchScreen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 0F5497492ADC8E6500A6D01F /* SwiftUseFrameworks.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwiftUseFrameworks.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 0F54974C2ADC8E6500A6D01F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 0F54974E2ADC8E6500A6D01F /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; + 0F5497502ADC8E6500A6D01F /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + 0F5497532ADC8E6500A6D01F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 0F5497552ADC8E6500A6D01F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 0F5497582ADC8E6500A6D01F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 0F54975A2ADC8E6500A6D01F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 0F5497462ADC8E6500A6D01F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 0F5497402ADC8E6500A6D01F = { + isa = PBXGroup; + children = ( + 0F54974B2ADC8E6500A6D01F /* SwiftUseFrameworks */, + 0F54974A2ADC8E6500A6D01F /* Products */, + ); + sourceTree = ""; + }; + 0F54974A2ADC8E6500A6D01F /* Products */ = { + isa = PBXGroup; + children = ( + 0F5497492ADC8E6500A6D01F /* SwiftUseFrameworks.app */, + ); + name = Products; + sourceTree = ""; + }; + 0F54974B2ADC8E6500A6D01F /* SwiftUseFrameworks */ = { + isa = PBXGroup; + children = ( + 0F54974C2ADC8E6500A6D01F /* AppDelegate.swift */, + 0F54974E2ADC8E6500A6D01F /* SceneDelegate.swift */, + 0F5497502ADC8E6500A6D01F /* ViewController.swift */, + 0F5497522ADC8E6500A6D01F /* Main.storyboard */, + 0F5497552ADC8E6500A6D01F /* Assets.xcassets */, + 0F5497572ADC8E6500A6D01F /* LaunchScreen.storyboard */, + 0F54975A2ADC8E6500A6D01F /* Info.plist */, + ); + path = SwiftUseFrameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 0F5497482ADC8E6500A6D01F /* SwiftUseFrameworks */ = { + isa = PBXNativeTarget; + buildConfigurationList = 0F54975D2ADC8E6500A6D01F /* Build configuration list for PBXNativeTarget "SwiftUseFrameworks" */; + buildPhases = ( + 0F5497452ADC8E6500A6D01F /* Sources */, + 0F5497462ADC8E6500A6D01F /* Frameworks */, + 0F5497472ADC8E6500A6D01F /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = SwiftUseFrameworks; + productName = SwiftUseFrameworks; + productReference = 0F5497492ADC8E6500A6D01F /* SwiftUseFrameworks.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 0F5497412ADC8E6500A6D01F /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = 1; + LastSwiftUpdateCheck = 1500; + LastUpgradeCheck = 1500; + TargetAttributes = { + 0F5497482ADC8E6500A6D01F = { + CreatedOnToolsVersion = 15.0; + }; + }; + }; + buildConfigurationList = 0F5497442ADC8E6500A6D01F /* Build configuration list for PBXProject "SwiftUseFrameworks" */; + compatibilityVersion = "Xcode 14.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 0F5497402ADC8E6500A6D01F; + productRefGroup = 0F54974A2ADC8E6500A6D01F /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 0F5497482ADC8E6500A6D01F /* SwiftUseFrameworks */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 0F5497472ADC8E6500A6D01F /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 0F5497592ADC8E6500A6D01F /* LaunchScreen.storyboard in Resources */, + 0F5497562ADC8E6500A6D01F /* Assets.xcassets in Resources */, + 0F5497542ADC8E6500A6D01F /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 0F5497452ADC8E6500A6D01F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 0F5497512ADC8E6500A6D01F /* ViewController.swift in Sources */, + 0F54974D2ADC8E6500A6D01F /* AppDelegate.swift in Sources */, + 0F54974F2ADC8E6500A6D01F /* SceneDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 0F5497522ADC8E6500A6D01F /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 0F5497532ADC8E6500A6D01F /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 0F5497572ADC8E6500A6D01F /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 0F5497582ADC8E6500A6D01F /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 0F54975B2ADC8E6500A6D01F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 0F54975C2ADC8E6500A6D01F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 0F54975E2ADC8E6500A6D01F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = F4HM4BJK94; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = SwiftUseFrameworks/Info.plist; + INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; + INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; + INFOPLIST_KEY_UIMainStoryboardFile = Main; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = io.grpc.SwiftUseFrameworks; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 0F54975F2ADC8E6500A6D01F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = F4HM4BJK94; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = SwiftUseFrameworks/Info.plist; + INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; + INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; + INFOPLIST_KEY_UIMainStoryboardFile = Main; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = io.grpc.SwiftUseFrameworks; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 0F5497442ADC8E6500A6D01F /* Build configuration list for PBXProject "SwiftUseFrameworks" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 0F54975B2ADC8E6500A6D01F /* Debug */, + 0F54975C2ADC8E6500A6D01F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 0F54975D2ADC8E6500A6D01F /* Build configuration list for PBXNativeTarget "SwiftUseFrameworks" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 0F54975E2ADC8E6500A6D01F /* Debug */, + 0F54975F2ADC8E6500A6D01F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 0F5497412ADC8E6500A6D01F /* Project object */; +} diff --git a/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/AppDelegate.swift b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/AppDelegate.swift new file mode 100644 index 00000000000..b956706162c --- /dev/null +++ b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/AppDelegate.swift @@ -0,0 +1,36 @@ +// +// AppDelegate.swift +// SwiftUseFrameworks +// +// Created by Hannah Shi on 10/15/23. +// + +import UIKit + +@main +class AppDelegate: UIResponder, UIApplicationDelegate { + + + + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { + // Override point for customization after application launch. + return true + } + + // MARK: UISceneSession Lifecycle + + func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration { + // Called when a new scene session is being created. + // Use this method to select a configuration to create the new scene with. + return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role) + } + + func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set) { + // Called when the user discards a scene session. + // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions. + // Use this method to release any resources that were specific to the discarded scenes, as they will not return. + } + + +} + diff --git a/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/Assets.xcassets/AccentColor.colorset/Contents.json b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 00000000000..eb878970081 --- /dev/null +++ b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,11 @@ +{ + "colors" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/Assets.xcassets/AppIcon.appiconset/Contents.json b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000000..13613e3ee1a --- /dev/null +++ b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,13 @@ +{ + "images" : [ + { + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/Assets.xcassets/Contents.json b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/Assets.xcassets/Contents.json new file mode 100644 index 00000000000..73c00596a7f --- /dev/null +++ b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/Base.lproj/LaunchScreen.storyboard b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 00000000000..865e9329f37 --- /dev/null +++ b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/Base.lproj/Main.storyboard b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/Base.lproj/Main.storyboard new file mode 100644 index 00000000000..25a763858ec --- /dev/null +++ b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/Base.lproj/Main.storyboard @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/Info.plist b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/Info.plist new file mode 100644 index 00000000000..dd3c9afdae3 --- /dev/null +++ b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/Info.plist @@ -0,0 +1,25 @@ + + + + + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneConfigurationName + Default Configuration + UISceneDelegateClassName + $(PRODUCT_MODULE_NAME).SceneDelegate + UISceneStoryboardFile + Main + + + + + + diff --git a/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/SceneDelegate.swift b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/SceneDelegate.swift new file mode 100644 index 00000000000..1e2bc2f4a59 --- /dev/null +++ b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/SceneDelegate.swift @@ -0,0 +1,52 @@ +// +// SceneDelegate.swift +// SwiftUseFrameworks +// +// Created by Hannah Shi on 10/15/23. +// + +import UIKit + +class SceneDelegate: UIResponder, UIWindowSceneDelegate { + + var window: UIWindow? + + + func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { + // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. + // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. + // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). + guard let _ = (scene as? UIWindowScene) else { return } + } + + func sceneDidDisconnect(_ scene: UIScene) { + // Called as the scene is being released by the system. + // This occurs shortly after the scene enters the background, or when its session is discarded. + // Release any resources associated with this scene that can be re-created the next time the scene connects. + // The scene may re-connect later, as its session was not necessarily discarded (see `application:didDiscardSceneSessions` instead). + } + + func sceneDidBecomeActive(_ scene: UIScene) { + // Called when the scene has moved from an inactive state to an active state. + // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive. + } + + func sceneWillResignActive(_ scene: UIScene) { + // Called when the scene will move from an active state to an inactive state. + // This may occur due to temporary interruptions (ex. an incoming phone call). + } + + func sceneWillEnterForeground(_ scene: UIScene) { + // Called as the scene transitions from the background to the foreground. + // Use this method to undo the changes made on entering the background. + } + + func sceneDidEnterBackground(_ scene: UIScene) { + // Called as the scene transitions from the foreground to the background. + // Use this method to save data, release shared resources, and store enough scene-specific state information + // to restore the scene back to its current state. + } + + +} + diff --git a/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/ViewController.swift b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/ViewController.swift new file mode 100644 index 00000000000..18042878985 --- /dev/null +++ b/src/objective-c/examples/SwiftUseFrameworks/SwiftUseFrameworks/ViewController.swift @@ -0,0 +1,19 @@ +// +// ViewController.swift +// SwiftUseFrameworks +// +// Created by Hannah Shi on 10/15/23. +// + +import UIKit + +class ViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + // Do any additional setup after loading the view. + } + + +} + diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template index 6bba4e1aa6c..c1f739ce85e 100644 --- a/templates/gRPC.podspec.template +++ b/templates/gRPC.podspec.template @@ -72,7 +72,7 @@ "src/objective-c/GRPCClient/GRPCCall+Tests.h", "src/objective-c/GRPCClient/GRPCCallLegacy.h", "src/objective-c/GRPCClient/GRPCTypes.h", - "src/objective-c/GRPCClient/GRPCTypes.m" + "src/objective-c/GRPCClient/GRPCTypes.mm" ss.dependency "gRPC-RxLibrary/Interface", version s.ios.deployment_target = '10.0' @@ -93,19 +93,19 @@ 'src/objective-c/GRPCClient/version.h' ss.source_files = 'src/objective-c/GRPCClient/GRPCCall.h', - 'src/objective-c/GRPCClient/GRPCCall.m', + 'src/objective-c/GRPCClient/GRPCCall.mm', 'src/objective-c/GRPCClient/GRPCCall+Interceptor.h', - 'src/objective-c/GRPCClient/GRPCCall+Interceptor.m', + 'src/objective-c/GRPCClient/GRPCCall+Interceptor.mm', 'src/objective-c/GRPCClient/GRPCCallOptions.h', - 'src/objective-c/GRPCClient/GRPCCallOptions.m', + 'src/objective-c/GRPCClient/GRPCCallOptions.mm', 'src/objective-c/GRPCClient/GRPCDispatchable.h', 'src/objective-c/GRPCClient/GRPCInterceptor.h', - 'src/objective-c/GRPCClient/GRPCInterceptor.m', + 'src/objective-c/GRPCClient/GRPCInterceptor.mm', 'src/objective-c/GRPCClient/GRPCTransport.h', - 'src/objective-c/GRPCClient/GRPCTransport.m', + 'src/objective-c/GRPCClient/GRPCTransport.mm', 'src/objective-c/GRPCClient/internal/*.h', 'src/objective-c/GRPCClient/private/GRPCTransport+Private.h', - 'src/objective-c/GRPCClient/private/GRPCTransport+Private.m', + 'src/objective-c/GRPCClient/private/GRPCTransport+Private.mm', 'src/objective-c/GRPCClient/version.h' ss.dependency "#{s.name}/Interface-Legacy", version @@ -125,18 +125,18 @@ 'src/objective-c/GRPCClient/GRPCCall+Tests.h', 'src/objective-c/GRPCClient/GRPCCall+ChannelArg.h' ss.private_header_files = 'src/objective-c/GRPCClient/private/GRPCCore/*.h' - ss.source_files = 'src/objective-c/GRPCClient/private/GRPCCore/*.{h,m}', + ss.source_files = 'src/objective-c/GRPCClient/private/GRPCCore/*.{h,mm}', 'src/objective-c/GRPCClient/GRPCCall+ChannelArg.h', - 'src/objective-c/GRPCClient/GRPCCall+ChannelArg.m', + 'src/objective-c/GRPCClient/GRPCCall+ChannelArg.mm', 'src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.h', - 'src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.m', + 'src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.mm', 'src/objective-c/GRPCClient/GRPCCall+Cronet.h', - 'src/objective-c/GRPCClient/GRPCCall+Cronet.m', + 'src/objective-c/GRPCClient/GRPCCall+Cronet.mm', 'src/objective-c/GRPCClient/GRPCCall+OAuth2.h', - 'src/objective-c/GRPCClient/GRPCCall+OAuth2.m', + 'src/objective-c/GRPCClient/GRPCCall+OAuth2.mm', 'src/objective-c/GRPCClient/GRPCCall+Tests.h', - 'src/objective-c/GRPCClient/GRPCCall+Tests.m', - 'src/objective-c/GRPCClient/GRPCCallLegacy.m' + 'src/objective-c/GRPCClient/GRPCCall+Tests.mm', + 'src/objective-c/GRPCClient/GRPCCallLegacy.mm' # Certificates, to be able to establish TLS connections: ss.resource_bundles = { 'gRPCCertificates' => ['etc/roots.pem'] } @@ -156,8 +156,8 @@ ss.header_mappings_dir = 'src/objective-c/GRPCClient' ss.source_files = 'src/objective-c/GRPCClient/GRPCCall+Cronet.h', - 'src/objective-c/GRPCClient/GRPCCall+Cronet.m', - 'src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/*.{h,m}' + 'src/objective-c/GRPCClient/GRPCCall+Cronet.mm', + 'src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/*.{h,mm}' ss.dependency "#{s.name}/GRPCCore", version ss.dependency 'gRPC-Core/Cronet-Implementation', version ss.dependency 'CronetFramework' @@ -178,7 +178,7 @@ s.subspec 'InternalTesting' do |ss| ss.dependency "#{s.name}/GRPCCore", version ss.public_header_files = 'src/objective-c/GRPCClient/internal_testing/*.h' - ss.source_files = 'src/objective-c/GRPCClient/internal_testing/*.{h,m}' + ss.source_files = 'src/objective-c/GRPCClient/internal_testing/*.{h,mm}' ss.header_mappings_dir = 'src/objective-c/GRPCClient' s.ios.deployment_target = '10.0' diff --git a/templates/src/objective-c/BoringSSL-GRPC.podspec.template b/templates/src/objective-c/BoringSSL-GRPC.podspec.template index 8220876951a..e0b511d30ea 100644 --- a/templates/src/objective-c/BoringSSL-GRPC.podspec.template +++ b/templates/src/objective-c/BoringSSL-GRPC.podspec.template @@ -147,6 +147,7 @@ # making the linter happy. s.subspec 'Interface' do |ss| ss.header_mappings_dir = 'src/include/openssl' + ss.private_header_files = 'src/include/openssl/time.h' ss.source_files = 'src/include/openssl/*.h' end s.subspec 'Implementation' do |ss| diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 091817a065a..ea1b1b02052 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -1187,6 +1187,19 @@ class ObjCLanguage(object): }, ) ) + out.append( + self.config.job_spec( + ["src/objective-c/tests/build_one_example.sh"], + timeout_seconds=20 * 60, + shortname="ios-buildtest-example-switft-use-frameworks", + cpu_cost=1e6, + environ={ + "SCHEME": "SwiftUseFrameworks", + "EXAMPLE_PATH": "src/objective-c/examples/SwiftUseFrameworks", + }, + ) + ) + # Disabled due to #20258 # TODO (mxyan): Reenable this test when #20258 is resolved. # out.append(