17 files changed, 7 insertions, 7 deletions
diff --git a/src/objective-c/GRPCClient/private/GRPCCore/ChannelArgsUtil.m b/src/objective-c/GRPCClient/private/GRPCCore/ChannelArgsUtil.mm
index a80bf9d6cb..a80bf9d6cb 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/ChannelArgsUtil.m
+++ b/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
index c91e2f0ec3..c91e2f0ec3 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCallInternal.m
+++ b/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
index 5727f01c96..7f29485fee 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
index b42fd6e0a1..b42fd6e0a1 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/GRPCChannelPool.m
+++ b/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
index 38dda64b72..38dda64b72 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCompletionQueue.m
+++ b/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
index a595f4b7e6..a595f4b7e6 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCoreCronetFactory.m
+++ b/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
index da3f3afd85..da3f3afd85 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/GRPCCronetChannelFactory.m
+++ b/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
index c3cefb7b64..c3cefb7b64 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreFactory.m
+++ b/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
index 07d3125548..07d3125548 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/GRPCHost.m
+++ b/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
index 89679ba298..89679ba298 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/GRPCInsecureChannelFactory.m
+++ b/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
index 008232464d..008232464d 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/GRPCOpBatchLog.m
+++ b/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
index dd3f51d8d0..dd3f51d8d0 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/GRPCRequestHeaders.m
+++ b/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
index 8321ac5b35..8321ac5b35 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/GRPCSecureChannelFactory.m
+++ b/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
index c54a9b8e29..687bf9783b 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
index 3b46929bf2..3b46929bf2 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/NSData+GRPC.m
+++ b/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
index 79c4e9ab8b..79c4e9ab8b 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/NSDictionary+GRPC.m
+++ b/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
index f76fbb6bc7..f76fbb6bc7 100644
--- a/src/objective-c/GRPCClient/private/GRPCCore/NSError+GRPC.m
+++ b/src/objective-c/GRPCClient/private/GRPCCore/NSError+GRPC.mm