From 647e24c190465e9547583a631ac5b33de98ae812 Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Tue, 23 Oct 2018 11:31:36 -0700
Subject: Put logContext in class extension

---
 gRPC.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gRPC.podspec')

diff --git a/gRPC.podspec b/gRPC.podspec
index 5e513cb127..47a130d12d 100644
--- a/gRPC.podspec
+++ b/gRPC.podspec
@@ -58,7 +58,7 @@ Pod::Spec.new do |s|
 
     ss.source_files = "#{src_dir}/*.{h,m}", "#{src_dir}/**/*.{h,m}"
     ss.exclude_files = "#{src_dir}/GRPCCall+GID.{h,m}"
-    ss.private_header_files = "#{src_dir}/private/*.h"
+    ss.private_header_files = "#{src_dir}/private/*.h", "#{src_dir}/internal/GRPCCallOptions+Internal.h"
 
     ss.dependency 'gRPC-Core', version
   end
-- 
cgit v1.2.3


From a0f5db15815d3ec5b2ad3b781cca5e2eb6468824 Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Tue, 6 Nov 2018 17:42:30 -0800
Subject: Rename GRPCCallOptions+internal->GRPCCallOptions+Internal

---
 gRPC.podspec                                       |  2 +-
 .../GRPCClient/internal/GRPCCallOptions+Internal.h | 39 ++++++++++++++++++++++
 .../GRPCClient/internal/GRPCCallOptions+internal.h | 39 ----------------------
 templates/gRPC.podspec.template                    |  2 +-
 4 files changed, 41 insertions(+), 41 deletions(-)
 create mode 100644 src/objective-c/GRPCClient/internal/GRPCCallOptions+Internal.h
 delete mode 100644 src/objective-c/GRPCClient/internal/GRPCCallOptions+internal.h

(limited to 'gRPC.podspec')

diff --git a/gRPC.podspec b/gRPC.podspec
index 47a130d12d..d8aa997e7c 100644
--- a/gRPC.podspec
+++ b/gRPC.podspec
@@ -58,7 +58,7 @@ Pod::Spec.new do |s|
 
     ss.source_files = "#{src_dir}/*.{h,m}", "#{src_dir}/**/*.{h,m}"
     ss.exclude_files = "#{src_dir}/GRPCCall+GID.{h,m}"
-    ss.private_header_files = "#{src_dir}/private/*.h", "#{src_dir}/internal/GRPCCallOptions+Internal.h"
+    ss.private_header_files = "#{src_dir}/private/*.h", "#{src_dir}/internal/*.h"
 
     ss.dependency 'gRPC-Core', version
   end
diff --git a/src/objective-c/GRPCClient/internal/GRPCCallOptions+Internal.h b/src/objective-c/GRPCClient/internal/GRPCCallOptions+Internal.h
new file mode 100644
index 0000000000..eb691b3acb
--- /dev/null
+++ b/src/objective-c/GRPCClient/internal/GRPCCallOptions+Internal.h
@@ -0,0 +1,39 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+#import "../GRPCCallOptions.h"
+
+@interface GRPCCallOptions ()
+
+/**
+ * Parameter used for internal logging.
+ */
+@property(readonly) id logContext;
+
+@end
+
+@interface GRPCMutableCallOptions ()
+
+/**
+ * Parameter used for internal logging.
+ */
+@property(readwrite) id logContext;
+
+@end
diff --git a/src/objective-c/GRPCClient/internal/GRPCCallOptions+internal.h b/src/objective-c/GRPCClient/internal/GRPCCallOptions+internal.h
deleted file mode 100644
index eb691b3acb..0000000000
--- a/src/objective-c/GRPCClient/internal/GRPCCallOptions+internal.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *
- * Copyright 2018 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#import <Foundation/Foundation.h>
-
-#import "../GRPCCallOptions.h"
-
-@interface GRPCCallOptions ()
-
-/**
- * Parameter used for internal logging.
- */
-@property(readonly) id logContext;
-
-@end
-
-@interface GRPCMutableCallOptions ()
-
-/**
- * Parameter used for internal logging.
- */
-@property(readwrite) id logContext;
-
-@end
diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template
index a3ed1d7858..593d277e5b 100644
--- a/templates/gRPC.podspec.template
+++ b/templates/gRPC.podspec.template
@@ -60,7 +60,7 @@
 
       ss.source_files = "#{src_dir}/*.{h,m}", "#{src_dir}/**/*.{h,m}"
       ss.exclude_files = "#{src_dir}/GRPCCall+GID.{h,m}"
-      ss.private_header_files = "#{src_dir}/private/*.h", "#{src_dir}/internal/GRPCCallOptions+Internal.h"
+      ss.private_header_files = "#{src_dir}/private/*.h", "#{src_dir}/internal/*.h"
 
       ss.dependency 'gRPC-Core', version
     end
-- 
cgit v1.2.3