Merge remote-tracking branch 'upstream/master' into fix-stream-compression-config-interface

1 files changed, 25 insertions, 25 deletions

diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 27410ed0b3..7ee7bb52d2 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -22,7 +22,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'gRPC-Core'
-  version = '1.9.0-dev'
+  version = '1.10.0-dev'
   s.version  = version
   s.summary  = 'Core cross-platform gRPC library, written in C'
   s.homepage = 'https://grpc.io'
@@ -193,13 +193,7 @@ Pod::Spec.new do |s|
     ss.dependency 'nanopb', '~> 0.3'
 
     # To save you from scrolling, this is the last part of the podspec.
-    ss.source_files = 'src/core/lib/gpr++/abstract.h',
-                      'src/core/lib/gpr++/atomic.h',
-                      'src/core/lib/gpr++/atomic_with_atm.h',
-                      'src/core/lib/gpr++/atomic_with_std.h',
-                      'src/core/lib/gpr++/manual_constructor.h',
-                      'src/core/lib/gpr++/memory.h',
-                      'src/core/lib/gpr/arena.h',
+    ss.source_files = 'src/core/lib/gpr/arena.h',
                       'src/core/lib/gpr/env.h',
                       'src/core/lib/gpr/fork.h',
                       'src/core/lib/gpr/mpscq.h',
@@ -210,6 +204,12 @@ Pod::Spec.new do |s|
                       'src/core/lib/gpr/thd_internal.h',
                       'src/core/lib/gpr/time_precise.h',
                       'src/core/lib/gpr/tmpfile.h',
+                      'src/core/lib/gprpp/abstract.h',
+                      'src/core/lib/gprpp/atomic.h',
+                      'src/core/lib/gprpp/atomic_with_atm.h',
+                      'src/core/lib/gprpp/atomic_with_std.h',
+                      'src/core/lib/gprpp/manual_constructor.h',
+                      'src/core/lib/gprpp/memory.h',
                       'src/core/lib/profiling/timers.h',
                       'src/core/lib/gpr/alloc.cc',
                       'src/core/lib/gpr/arena.cc',
@@ -346,11 +346,11 @@ Pod::Spec.new do |s|
                       'src/core/lib/compression/stream_compression_identity.h',
                       'src/core/lib/debug/stats.h',
                       'src/core/lib/debug/stats_data.h',
-                      'src/core/lib/gpr++/debug_location.h',
-                      'src/core/lib/gpr++/inlined_vector.h',
-                      'src/core/lib/gpr++/orphanable.h',
-                      'src/core/lib/gpr++/ref_counted.h',
-                      'src/core/lib/gpr++/ref_counted_ptr.h',
+                      'src/core/lib/gprpp/debug_location.h',
+                      'src/core/lib/gprpp/inlined_vector.h',
+                      'src/core/lib/gprpp/orphanable.h',
+                      'src/core/lib/gprpp/ref_counted.h',
+                      'src/core/lib/gprpp/ref_counted_ptr.h',
                       'src/core/lib/http/format_request.h',
                       'src/core/lib/http/httpcli.h',
                       'src/core/lib/http/parser.h',
@@ -722,13 +722,7 @@ Pod::Spec.new do |s|
                       'src/core/ext/filters/workarounds/workaround_utils.cc',
                       'src/core/plugin_registry/grpc_plugin_registry.cc'
 
-    ss.private_header_files = 'src/core/lib/gpr++/abstract.h',
-                              'src/core/lib/gpr++/atomic.h',
-                              'src/core/lib/gpr++/atomic_with_atm.h',
-                              'src/core/lib/gpr++/atomic_with_std.h',
-                              'src/core/lib/gpr++/manual_constructor.h',
-                              'src/core/lib/gpr++/memory.h',
-                              'src/core/lib/gpr/arena.h',
+    ss.private_header_files = 'src/core/lib/gpr/arena.h',
                               'src/core/lib/gpr/env.h',
                               'src/core/lib/gpr/fork.h',
                               'src/core/lib/gpr/mpscq.h',
@@ -739,6 +733,12 @@ Pod::Spec.new do |s|
                               'src/core/lib/gpr/thd_internal.h',
                               'src/core/lib/gpr/time_precise.h',
                               'src/core/lib/gpr/tmpfile.h',
+                              'src/core/lib/gprpp/abstract.h',
+                              'src/core/lib/gprpp/atomic.h',
+                              'src/core/lib/gprpp/atomic_with_atm.h',
+                              'src/core/lib/gprpp/atomic_with_std.h',
+                              'src/core/lib/gprpp/manual_constructor.h',
+                              'src/core/lib/gprpp/memory.h',
                               'src/core/lib/profiling/timers.h',
                               'src/core/ext/transport/chttp2/transport/bin_decoder.h',
                               'src/core/ext/transport/chttp2/transport/bin_encoder.h',
@@ -831,11 +831,11 @@ Pod::Spec.new do |s|
                               'src/core/lib/compression/stream_compression_identity.h',
                               'src/core/lib/debug/stats.h',
                               'src/core/lib/debug/stats_data.h',
-                              'src/core/lib/gpr++/debug_location.h',
-                              'src/core/lib/gpr++/inlined_vector.h',
-                              'src/core/lib/gpr++/orphanable.h',
-                              'src/core/lib/gpr++/ref_counted.h',
-                              'src/core/lib/gpr++/ref_counted_ptr.h',
+                              'src/core/lib/gprpp/debug_location.h',
+                              'src/core/lib/gprpp/inlined_vector.h',
+                              'src/core/lib/gprpp/orphanable.h',
+                              'src/core/lib/gprpp/ref_counted.h',
+                              'src/core/lib/gprpp/ref_counted_ptr.h',
                               'src/core/lib/http/format_request.h',
                               'src/core/lib/http/httpcli.h',
                               'src/core/lib/http/parser.h',