Release 5.12.0

Example/Podfile

@@ -15,7 +15,7 @@ target 'Core_Example_iOS' do
   # The next line is the forcing function for the Firebase pod. The Firebase
   # version's subspecs should depend on the component versions in their
   # corresponding podspec's.
-  pod 'Firebase/CoreOnly', '5.11.0'
+  pod 'Firebase/CoreOnly', '5.12.0'
 
   target 'Core_Tests_iOS' do
     inherit! :search_paths

Firebase/Core/FIROptions.m

@@ -43,7 +43,7 @@
 NSString *const kFIRLibraryVersionID =
     @"5"     // Major version (one or more digits)
     @"01"    // Minor version (exactly 2 digits)
-    @"06"    // Build number (exactly 2 digits)
+    @"07"    // Build number (exactly 2 digits)
     @"000";  // Fixed "000"
 // Plist file name.
 NSString *const kServiceInfoFileName = @"GoogleService-Info";

FirebaseAuth.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseAuth'
-  s.version          = '5.0.4'
+  s.version          = '5.0.5'
   s.summary          = 'The official iOS client for Firebase Authentication (plus community support for macOS and tvOS)'
 
   s.description      = <<-DESC

FirebaseCore.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseCore'
-  s.version          = '5.1.6'
+  s.version          = '5.1.7'
   s.summary          = 'Firebase Core for iOS (plus community support for macOS and tvOS)'
 
   s.description      = <<-DESC
@@ -32,7 +32,7 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration
   s.pod_target_xcconfig = {
     'GCC_C_LANGUAGE_STANDARD' => 'c99',
     'GCC_PREPROCESSOR_DEFINITIONS' =>
-      'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=5.11.0',
+      'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=5.12.0',
     'OTHER_CFLAGS' => '-fno-autolink'
   }
 end

FirebaseFirestore.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseFirestore'
-  s.version          = '0.13.6'
+  s.version          = '0.14.0'
   s.summary          = 'Google Cloud Firestore for iOS'
 
   s.description      = <<-DESC
@@ -25,7 +25,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
   s.source_files = [
     'Firestore/Source/**/*',
     'Firestore/Port/**/*',
-    'Firestore/Protos/nanopb/**/*.[hc]',
+    'Firestore/Protos/nanopb/**/*.{h,cc}',
     'Firestore/Protos/objc/**/*.[hm]',
     'Firestore/core/include/**/*.{h,cc,mm}',
     'Firestore/core/src/**/*.{h,cc,mm}',
@@ -68,7 +68,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
       # The nanopb pod sets these defs, so we must too. (We *do* require 16bit
       # (or larger) fields, so we'd have to set at least PB_FIELD_16BIT
       # anyways.)
-      'PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1',
+      'PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1',
     'HEADER_SEARCH_PATHS' =>
       '"${PODS_TARGET_SRCROOT}" ' +
       '"${PODS_TARGET_SRCROOT}/Firestore/third_party/abseil-cpp" ' +

FirebaseStorage.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseStorage'
-  s.version          = '3.0.2'
+  s.version          = '3.0.3'
   s.summary          = 'Firebase Storage for iOS (plus community support for macOS and tvOS)'
 
   s.description      = <<-DESC

Firestore/Example/Podfile

@@ -10,7 +10,7 @@ target 'Firestore_Example_iOS' do
   # The next line is the forcing function for the Firebase pod. The Firebase
   # version's subspecs should depend on the component versions in their
   # corresponding podspec's.
-  pod 'Firebase/CoreOnly', '5.11.0'
+  pod 'Firebase/CoreOnly', '5.12.0'
 
   pod 'FirebaseAuth', :path => '../../'
   pod 'FirebaseAuthInterop', :path => '../../'

Firestore/Protos/CMakeLists.txt

@@ -67,7 +67,7 @@ endforeach()
 foreach(root ${PROTO_FILE_ROOTS} ${WELL_KNOWN_PROTO_FILE_ROOTS})
   list(
     APPEND NANOPB_GENERATED_SOURCES
-    ${OUTPUT_DIR}/nanopb/${root}.nanopb.c
+    ${OUTPUT_DIR}/nanopb/${root}.nanopb.cc
     ${OUTPUT_DIR}/nanopb/${root}.nanopb.h
   )
 endforeach()

Firestore/Protos/build_protos.py

@@ -121,8 +121,14 @@ def run(self):
 
     self.__run_generator(nanopb_out)
 
-    sources = collect_files(nanopb_out, '.nanopb.h', '.nanopb.c')
-    post_process_files(sources, add_copyright, nanopb_rename_delete)
+    sources = collect_files(nanopb_out, '.nanopb.h', '.nanopb.cc')
+    post_process_files(
+        sources,
+        add_copyright,
+        nanopb_add_namespaces,
+        nanopb_remove_extern_c,
+        nanopb_rename_delete
+    )
 
   def __run_generator(self, out_dir):
     """Invokes protoc using the nanopb plugin."""
@@ -133,6 +139,7 @@ def __run_generator(self, out_dir):
 
     nanopb_flags = ' '.join([
         '--extension=.nanopb',
+        '--source-extension=.cc',
         '--no-timestamp',
     ])
     cmd.append('--nanopb_out=%s:%s' % (nanopb_flags, out_dir))
@@ -286,6 +293,57 @@ def add_copyright(lines):
   return result
 
 
+def nanopb_add_namespaces(lines):
+  """Adds C++ namespaces to the lines.
+
+  Args:
+    lines: The lines to fix.
+
+  Returns:
+    The lines, fixed.
+  """
+  result = []
+  for line in lines:
+    if '@@protoc_insertion_point(includes)' in line:
+      result.append('namespace firebase {\n')
+      result.append('namespace firestore {\n')
+      result.append('\n')
+
+    if '@@protoc_insertion_point(eof)' in line:
+      result.append('}  // namespace firestore\n')
+      result.append('}  // namespace firebase\n')
+      result.append('\n')
+
+    result.append(line)
+
+  return result
+
+
+def nanopb_remove_extern_c(lines):
+  """Removes extern "C" directives from nanopb code.
+
+  Args:
+    lines: A nanobp-generated source file, split into lines.
+  Returns:
+    A list of strings, similar to the input but modified to remove extern "C".
+  """
+  result = []
+  state = 'initial'
+  for line in lines:
+    if state == 'initial':
+      if '#ifdef __cplusplus' in line:
+        state = 'in-ifdef'
+        continue
+
+      result.append(line)
+
+    elif state == 'in-ifdef':
+      if '#endif' in line:
+        state = 'initial'
+
+  return result
+
+
 def nanopb_rename_delete(lines):
   """Renames a delete symbol to delete_.
 

Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.c → Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.cc

@@ -19,6 +19,9 @@
 
 #include "maybe_document.nanopb.h"
 
+namespace firebase {
+namespace firestore {
+
 /* @@protoc_insertion_point(includes) */
 #if PB_PROTO_HEADER_VERSION != 30
 #error Regenerate this file with the current version of nanopb generator.
@@ -71,4 +74,7 @@ PB_STATIC_ASSERT((pb_membersize(firestore_client_NoDocument, read_time) < 256 &&
 #endif
 
 
+}  // namespace firestore
+}  // namespace firebase
+
 /* @@protoc_insertion_point(eof) */

Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.h

@@ -25,14 +25,14 @@
 
 #include "google/protobuf/timestamp.nanopb.h"
 
+namespace firebase {
+namespace firestore {
+
 /* @@protoc_insertion_point(includes) */
 #if PB_PROTO_HEADER_VERSION != 30
 #error Regenerate this file with the current version of nanopb generator.
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /* Struct definitions */
 typedef struct _firestore_client_NoDocument {
@@ -96,9 +96,9 @@ extern const pb_field_t firestore_client_MaybeDocument_fields[5];
 
 #endif
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
+}  // namespace firestore
+}  // namespace firebase
+
 /* @@protoc_insertion_point(eof) */
 
 #endif

Firestore/Protos/nanopb/firestore/local/mutation.nanopb.c → Firestore/Protos/nanopb/firestore/local/mutation.nanopb.cc

@@ -19,6 +19,9 @@
 
 #include "mutation.nanopb.h"
 
+namespace firebase {
+namespace firestore {
+
 /* @@protoc_insertion_point(includes) */
 #if PB_PROTO_HEADER_VERSION != 30
 #error Regenerate this file with the current version of nanopb generator.
@@ -64,4 +67,7 @@ PB_STATIC_ASSERT((pb_membersize(firestore_client_WriteBatch, local_write_time) <
 #endif
 
 
+}  // namespace firestore
+}  // namespace firebase
+
 /* @@protoc_insertion_point(eof) */

Firestore/Protos/nanopb/firestore/local/mutation.nanopb.h

@@ -25,14 +25,14 @@
 
 #include "google/protobuf/timestamp.nanopb.h"
 
+namespace firebase {
+namespace firestore {
+
 /* @@protoc_insertion_point(includes) */
 #if PB_PROTO_HEADER_VERSION != 30
 #error Regenerate this file with the current version of nanopb generator.
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /* Struct definitions */
 typedef struct _firestore_client_MutationQueue {
@@ -80,9 +80,9 @@ extern const pb_field_t firestore_client_WriteBatch_fields[4];
 
 #endif
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
+}  // namespace firestore
+}  // namespace firebase
+
 /* @@protoc_insertion_point(eof) */
 
 #endif

Firestore/Protos/nanopb/firestore/local/target.nanopb.c → Firestore/Protos/nanopb/firestore/local/target.nanopb.cc

@@ -19,6 +19,9 @@
 
 #include "target.nanopb.h"
 
+namespace firebase {
+namespace firestore {
+
 /* @@protoc_insertion_point(includes) */
 #if PB_PROTO_HEADER_VERSION != 30
 #error Regenerate this file with the current version of nanopb generator.
@@ -69,4 +72,7 @@ PB_STATIC_ASSERT((pb_membersize(firestore_client_Target, query) < 256 && pb_memb
 #endif
 
 
+}  // namespace firestore
+}  // namespace firebase
+
 /* @@protoc_insertion_point(eof) */

Firestore/Protos/nanopb/firestore/local/target.nanopb.h

@@ -25,14 +25,14 @@
 
 #include "google/protobuf/timestamp.nanopb.h"
 
+namespace firebase {
+namespace firestore {
+
 /* @@protoc_insertion_point(includes) */
 #if PB_PROTO_HEADER_VERSION != 30
 #error Regenerate this file with the current version of nanopb generator.
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /* Struct definitions */
 typedef struct _firestore_client_Target {
@@ -92,9 +92,9 @@ extern const pb_field_t firestore_client_TargetGlobal_fields[5];
 
 #endif
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
+}  // namespace firestore
+}  // namespace firebase
+
 /* @@protoc_insertion_point(eof) */
 
 #endif

Firestore/Protos/nanopb/google/api/annotations.nanopb.c → Firestore/Protos/nanopb/google/api/annotations.nanopb.cc

@@ -19,6 +19,9 @@
 
 #include "annotations.nanopb.h"
 
+namespace firebase {
+namespace firestore {
+
 /* @@protoc_insertion_point(includes) */
 #if PB_PROTO_HEADER_VERSION != 30
 #error Regenerate this file with the current version of nanopb generator.
@@ -34,4 +37,7 @@
 #endif
 
 
+}  // namespace firestore
+}  // namespace firebase
+
 /* @@protoc_insertion_point(eof) */

Firestore/Protos/nanopb/google/api/annotations.nanopb.h

@@ -23,22 +23,22 @@
 
 #include "google/api/http.nanopb.h"
 
+namespace firebase {
+namespace firestore {
+
 /* @@protoc_insertion_point(includes) */
 #if PB_PROTO_HEADER_VERSION != 30
 #error Regenerate this file with the current version of nanopb generator.
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /* Extensions */
 /* Extension field google_api_http was skipped because only "optional"
    type of extension fields is currently supported. */
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
+}  // namespace firestore
+}  // namespace firebase
+
 /* @@protoc_insertion_point(eof) */
 
 #endif

Firestore/Protos/nanopb/google/api/http.nanopb.c → Firestore/Protos/nanopb/google/api/http.nanopb.cc

@@ -19,6 +19,9 @@
 
 #include "http.nanopb.h"
 
+namespace firebase {
+namespace firestore {
+
 /* @@protoc_insertion_point(includes) */
 #if PB_PROTO_HEADER_VERSION != 30
 #error Regenerate this file with the current version of nanopb generator.
@@ -76,4 +79,7 @@ PB_STATIC_ASSERT((pb_membersize(google_api_HttpRule, custom) < 256), YOU_MUST_DE
 #endif
 
 
+}  // namespace firestore
+}  // namespace firebase
+
 /* @@protoc_insertion_point(eof) */