Bump nanopb to 0.3.9.7 (#7108)

Crashlytics/ProtoSupport/generate_crashlytics_protos.sh

@@ -23,7 +23,7 @@
 readonly DIR="$( git rev-parse --show-toplevel )"
 
 # Current release of nanopb being used  to build the CCT protos
-readonly NANOPB_VERSION="0.3.9.6"
+readonly NANOPB_VERSION="0.3.9.7"
 readonly NANOPB_TEMPDIR="${DIR}/Crashlytics/nanopb_temp"
 
 readonly LIBRARY_DIR="${DIR}/Crashlytics/Crashlytics/"

Crashlytics/Protogen/nanopb/crashlytics.nanopb.c

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "Crashlytics/Protogen/nanopb/crashlytics.nanopb.h"
 
@@ -54,7 +54,7 @@ const pb_field_t google_crashlytics_FilesPayload_File_fields[3] = {
 #if !defined(PB_FIELD_32BIT)
 /* If you get an error here, it means that you need to define PB_FIELD_32BIT
  * compile-time option. You can do that in pb.h or on compiler command line.
- *
+ * 
  * The reason you need to do this is that some of your messages contain tag
  * numbers or field sizes that are larger than what can fit in 8 or 16 bit
  * field descriptors.
@@ -65,7 +65,7 @@ PB_STATIC_ASSERT((pb_membersize(google_crashlytics_Report, apple_payload) < 6553
 #if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
 /* If you get an error here, it means that you need to define PB_FIELD_16BIT
  * compile-time option. You can do that in pb.h or on compiler command line.
- *
+ * 
  * The reason you need to do this is that some of your messages contain tag
  * numbers or field sizes that are larger than what can fit in the default
  * 8 bit descriptors.

Crashlytics/Protogen/nanopb/crashlytics.nanopb.h

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_GOOGLE_CRASHLYTICS_CRASHLYTICS_NANOPB_H_INCLUDED
 #define PB_GOOGLE_CRASHLYTICS_CRASHLYTICS_NANOPB_H_INCLUDED

Firebase/CoreDiagnostics/FIRCDLibrary/Protogen/nanopb/firebasecore.nanopb.c

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "firebasecore.nanopb.h"
 

Firebase/CoreDiagnostics/FIRCDLibrary/Protogen/nanopb/firebasecore.nanopb.h

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_LOGS_PROTO_MOBILESDK_IOS_FIREBASECORE_NANOPB_H_INCLUDED
 #define PB_LOGS_PROTO_MOBILESDK_IOS_FIREBASECORE_NANOPB_H_INCLUDED

Firebase/CoreDiagnostics/ProtoSupport/generate_nanopb_protos.sh

@@ -23,7 +23,7 @@
 readonly REPO_DIR="$( git rev-parse --show-toplevel )"
 
 # Current release of nanopb being used  to build the CCT protos
-readonly NANOPB_VERSION="0.3.9.6"
+readonly NANOPB_VERSION="0.3.9.7"
 readonly NANOPB_TEMPDIR="$(mktemp -d)"
 
 readonly LIBRARY_DIR="${REPO_DIR}/Firebase/CoreDiagnostics/FIRCDLibrary"

FirebaseCore/CHANGELOG.md

@@ -1,3 +1,6 @@
+# Firebase 7.4.0
+- [changed] Patch update to nanopb 0.3.9.7 that fixes a memory leak and other issues. (#7090)
+
 # Firebase 7.3.0
 - [added] Added FirebaseAppDistribution-Beta product to Swift Package Manager. (#7045)
 

FirebaseCoreDiagnostics.podspec

@@ -54,7 +54,7 @@ non-Cocoapod integration. This library also respects the Firebase global data co
   s.dependency 'GoogleDataTransport', '~> 8.0'
   s.dependency 'GoogleUtilities/Environment', '~> 7.0'
   s.dependency 'GoogleUtilities/Logger', '~> 7.0'
-  s.dependency 'nanopb', '~> 2.30906.0'
+  s.dependency 'nanopb', '~> 2.30907.0'
 
   s.test_spec 'unit' do |unit_tests|
     unit_tests.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}

FirebaseCrashlytics.podspec

@@ -51,7 +51,7 @@ Pod::Spec.new do |s|
   s.dependency 'FirebaseInstallations', '~> 7.0'
   s.dependency 'PromisesObjC', '~> 1.2'
   s.dependency 'GoogleDataTransport', '~> 8.0'
-  s.dependency 'nanopb', '~> 2.30906.0'
+  s.dependency 'nanopb', '~> 2.30907.0'
 
   s.libraries = 'c++', 'z'
   s.ios.frameworks = 'Security', 'SystemConfiguration'

FirebaseFirestore.podspec

@@ -70,7 +70,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
 
   s.dependency 'gRPC-C++', '~> 1.28.0'
   s.dependency 'leveldb-library', '~> 1.22'
-  s.dependency 'nanopb', '~> 2.30906.0'
+  s.dependency 'nanopb', '~> 2.30907.0'
 
   s.ios.frameworks = 'SystemConfiguration', 'UIKit'
   s.osx.frameworks = 'SystemConfiguration'

FirebaseInAppMessaging.podspec

@@ -50,7 +50,7 @@ See more product details at https://firebase.google.com/products/in-app-messagin
   s.dependency 'FirebaseInstallations', '~> 7.0'
   s.dependency 'FirebaseABTesting', '~> 7.0'
   s.dependency 'GoogleUtilities/Environment', '~> 7.0'
-  s.dependency 'nanopb', '~> 2.30906.0'
+  s.dependency 'nanopb', '~> 2.30907.0'
 
   s.test_spec 'unit' do |unit_tests|
       unit_tests.source_files = 'FirebaseInAppMessaging/Tests/Unit/*.[mh]'

FirebaseInAppMessaging/ProtoSupport/generate_nanopb_protos.sh

@@ -23,7 +23,7 @@
 readonly REPO_DIR="$( git rev-parse --show-toplevel )"
 
 # Current release of nanopb being used  to build the CCT protos
-readonly NANOPB_VERSION="0.3.9.6"
+readonly NANOPB_VERSION="0.3.9.7"
 readonly NANOPB_TEMPDIR="$(mktemp -d)"
 
 readonly PROTO_DIR="${REPO_DIR}/FirebaseInAppMessaging/ProtoSupport/Protos"

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

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "maybe_document.nanopb.h"
 

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

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_FIRESTORE_CLIENT_MAYBE_DOCUMENT_NANOPB_H_INCLUDED
 #define PB_FIRESTORE_CLIENT_MAYBE_DOCUMENT_NANOPB_H_INCLUDED

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

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "mutation.nanopb.h"
 

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

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_FIRESTORE_CLIENT_MUTATION_NANOPB_H_INCLUDED
 #define PB_FIRESTORE_CLIENT_MUTATION_NANOPB_H_INCLUDED

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

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "target.nanopb.h"
 

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

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_FIRESTORE_CLIENT_TARGET_NANOPB_H_INCLUDED
 #define PB_FIRESTORE_CLIENT_TARGET_NANOPB_H_INCLUDED

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

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "annotations.nanopb.h"
 

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

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_GOOGLE_API_ANNOTATIONS_NANOPB_H_INCLUDED
 #define PB_GOOGLE_API_ANNOTATIONS_NANOPB_H_INCLUDED

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

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "http.nanopb.h"
 

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

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_GOOGLE_API_HTTP_NANOPB_H_INCLUDED
 #define PB_GOOGLE_API_HTTP_NANOPB_H_INCLUDED

Firestore/Protos/nanopb/google/firestore/v1/common.nanopb.cc

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "common.nanopb.h"
 

Firestore/Protos/nanopb/google/firestore/v1/common.nanopb.h

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_GOOGLE_FIRESTORE_V1_COMMON_NANOPB_H_INCLUDED
 #define PB_GOOGLE_FIRESTORE_V1_COMMON_NANOPB_H_INCLUDED

Firestore/Protos/nanopb/google/firestore/v1/document.nanopb.cc

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "document.nanopb.h"
 
@@ -60,7 +60,7 @@ const pb_field_t google_firestore_v1_Value_fields[12] = {
     PB_ANONYMOUS_ONEOF_FIELD(value_type,   8, MESSAGE , ONEOF, STATIC  , UNION, google_firestore_v1_Value, geo_point_value, geo_point_value, &google_type_LatLng_fields),
     PB_ANONYMOUS_ONEOF_FIELD(value_type,   9, MESSAGE , ONEOF, STATIC  , UNION, google_firestore_v1_Value, array_value, array_value, &google_firestore_v1_ArrayValue_fields),
     PB_ANONYMOUS_ONEOF_FIELD(value_type,  10, MESSAGE , ONEOF, STATIC  , UNION, google_firestore_v1_Value, timestamp_value, timestamp_value, &google_protobuf_Timestamp_fields),
-    PB_ANONYMOUS_ONEOF_FIELD(value_type,  11, ENUM    , ONEOF, STATIC  , UNION, google_firestore_v1_Value, null_value, null_value, 0),
+    PB_ANONYMOUS_ONEOF_FIELD(value_type,  11, UENUM   , ONEOF, STATIC  , UNION, google_firestore_v1_Value, null_value, null_value, 0),
     PB_ANONYMOUS_ONEOF_FIELD(value_type,  17, BYTES   , ONEOF, POINTER , UNION, google_firestore_v1_Value, string_value, string_value, 0),
     PB_ANONYMOUS_ONEOF_FIELD(value_type,  18, BYTES   , ONEOF, POINTER , UNION, google_firestore_v1_Value, bytes_value, bytes_value, 0),
     PB_LAST_FIELD
@@ -107,6 +107,12 @@ PB_STATIC_ASSERT((pb_membersize(google_firestore_v1_Document, create_time) < 256
 #endif
 
 
+/* On some platforms (such as AVR), double is really float.
+ * These are not directly supported by nanopb, but see example_avr_double.
+ * To get rid of this error, remove any double fields from your .proto.
+ */
+PB_STATIC_ASSERT(sizeof(double) == 8, DOUBLE_MUST_BE_8_BYTES)
+
 std::string google_firestore_v1_Document::ToString(int indent) const {
     std::string header = PrintHeader(indent, "Document", this);
     std::string result;

Firestore/Protos/nanopb/google/firestore/v1/document.nanopb.h

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_GOOGLE_FIRESTORE_V1_DOCUMENT_NANOPB_H_INCLUDED
 #define PB_GOOGLE_FIRESTORE_V1_DOCUMENT_NANOPB_H_INCLUDED

Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.cc

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "firestore.nanopb.h"
 

Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.h

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_GOOGLE_FIRESTORE_V1_FIRESTORE_NANOPB_H_INCLUDED
 #define PB_GOOGLE_FIRESTORE_V1_FIRESTORE_NANOPB_H_INCLUDED

Firestore/Protos/nanopb/google/firestore/v1/query.nanopb.cc

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "query.nanopb.h"
 

Firestore/Protos/nanopb/google/firestore/v1/query.nanopb.h

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_GOOGLE_FIRESTORE_V1_QUERY_NANOPB_H_INCLUDED
 #define PB_GOOGLE_FIRESTORE_V1_QUERY_NANOPB_H_INCLUDED

Firestore/Protos/nanopb/google/firestore/v1/write.nanopb.cc

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "write.nanopb.h"
 
@@ -55,7 +55,7 @@ const pb_field_t google_firestore_v1_DocumentTransform_fields[3] = {
 
 const pb_field_t google_firestore_v1_DocumentTransform_FieldTransform_fields[8] = {
     PB_FIELD(  1, BYTES   , SINGULAR, POINTER , FIRST, google_firestore_v1_DocumentTransform_FieldTransform, field_path, field_path, 0),
-    PB_ANONYMOUS_ONEOF_FIELD(transform_type,   2, ENUM    , ONEOF, STATIC  , OTHER, google_firestore_v1_DocumentTransform_FieldTransform, set_to_server_value, field_path, 0),
+    PB_ANONYMOUS_ONEOF_FIELD(transform_type,   2, UENUM   , ONEOF, STATIC  , OTHER, google_firestore_v1_DocumentTransform_FieldTransform, set_to_server_value, field_path, 0),
     PB_ANONYMOUS_ONEOF_FIELD(transform_type,   3, MESSAGE , ONEOF, STATIC  , UNION, google_firestore_v1_DocumentTransform_FieldTransform, increment, field_path, &google_firestore_v1_Value_fields),
     PB_ANONYMOUS_ONEOF_FIELD(transform_type,   4, MESSAGE , ONEOF, STATIC  , UNION, google_firestore_v1_DocumentTransform_FieldTransform, maximum, field_path, &google_firestore_v1_Value_fields),
     PB_ANONYMOUS_ONEOF_FIELD(transform_type,   5, MESSAGE , ONEOF, STATIC  , UNION, google_firestore_v1_DocumentTransform_FieldTransform, minimum, field_path, &google_firestore_v1_Value_fields),

Firestore/Protos/nanopb/google/firestore/v1/write.nanopb.h

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_GOOGLE_FIRESTORE_V1_WRITE_NANOPB_H_INCLUDED
 #define PB_GOOGLE_FIRESTORE_V1_WRITE_NANOPB_H_INCLUDED

Firestore/Protos/nanopb/google/protobuf/any.nanopb.cc

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "any.nanopb.h"
 

Firestore/Protos/nanopb/google/protobuf/any.nanopb.h

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_GOOGLE_PROTOBUF_ANY_NANOPB_H_INCLUDED
 #define PB_GOOGLE_PROTOBUF_ANY_NANOPB_H_INCLUDED

Firestore/Protos/nanopb/google/protobuf/empty.nanopb.cc

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "empty.nanopb.h"
 

Firestore/Protos/nanopb/google/protobuf/empty.nanopb.h

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_GOOGLE_PROTOBUF_EMPTY_NANOPB_H_INCLUDED
 #define PB_GOOGLE_PROTOBUF_EMPTY_NANOPB_H_INCLUDED

Firestore/Protos/nanopb/google/protobuf/struct.nanopb.cc

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "struct.nanopb.h"
 
@@ -49,7 +49,7 @@ const pb_field_t google_protobuf_Struct_FieldsEntry_fields[3] = {
 };
 
 const pb_field_t google_protobuf_Value_fields[7] = {
-    PB_ANONYMOUS_ONEOF_FIELD(kind,   1, ENUM    , ONEOF, STATIC  , FIRST, google_protobuf_Value, null_value, null_value, 0),
+    PB_ANONYMOUS_ONEOF_FIELD(kind,   1, UENUM   , ONEOF, STATIC  , FIRST, google_protobuf_Value, null_value, null_value, 0),
     PB_ANONYMOUS_ONEOF_FIELD(kind,   2, DOUBLE  , ONEOF, STATIC  , UNION, google_protobuf_Value, number_value, number_value, 0),
     PB_ANONYMOUS_ONEOF_FIELD(kind,   3, BYTES   , ONEOF, POINTER , UNION, google_protobuf_Value, string_value, string_value, 0),
     PB_ANONYMOUS_ONEOF_FIELD(kind,   4, BOOL    , ONEOF, STATIC  , UNION, google_protobuf_Value, bool_value, bool_value, 0),
@@ -89,6 +89,12 @@ PB_STATIC_ASSERT((pb_membersize(google_protobuf_Struct_FieldsEntry, value) < 256
 #endif
 
 
+/* On some platforms (such as AVR), double is really float.
+ * These are not directly supported by nanopb, but see example_avr_double.
+ * To get rid of this error, remove any double fields from your .proto.
+ */
+PB_STATIC_ASSERT(sizeof(double) == 8, DOUBLE_MUST_BE_8_BYTES)
+
 const char* EnumToString(
   google_protobuf_NullValue value) {
     switch (value) {

Firestore/Protos/nanopb/google/protobuf/struct.nanopb.h

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_GOOGLE_PROTOBUF_STRUCT_NANOPB_H_INCLUDED
 #define PB_GOOGLE_PROTOBUF_STRUCT_NANOPB_H_INCLUDED

Firestore/Protos/nanopb/google/protobuf/timestamp.nanopb.cc

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "timestamp.nanopb.h"
 

Firestore/Protos/nanopb/google/protobuf/timestamp.nanopb.h

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_GOOGLE_PROTOBUF_TIMESTAMP_NANOPB_H_INCLUDED
 #define PB_GOOGLE_PROTOBUF_TIMESTAMP_NANOPB_H_INCLUDED

Firestore/Protos/nanopb/google/protobuf/wrappers.nanopb.cc

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "wrappers.nanopb.h"
 

Firestore/Protos/nanopb/google/protobuf/wrappers.nanopb.h

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_GOOGLE_PROTOBUF_WRAPPERS_NANOPB_H_INCLUDED
 #define PB_GOOGLE_PROTOBUF_WRAPPERS_NANOPB_H_INCLUDED

Firestore/Protos/nanopb/google/rpc/status.nanopb.cc

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "status.nanopb.h"
 

Firestore/Protos/nanopb/google/rpc/status.nanopb.h

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_GOOGLE_RPC_STATUS_NANOPB_H_INCLUDED
 #define PB_GOOGLE_RPC_STATUS_NANOPB_H_INCLUDED

Firestore/Protos/nanopb/google/type/latlng.nanopb.cc

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "latlng.nanopb.h"
 

Firestore/Protos/nanopb/google/type/latlng.nanopb.h

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_GOOGLE_TYPE_LATLNG_NANOPB_H_INCLUDED
 #define PB_GOOGLE_TYPE_LATLNG_NANOPB_H_INCLUDED

GoogleDataTransport.podspec

@@ -39,7 +39,7 @@ Shared library for iOS SDK data transport needs.
 
   s.libraries = ['z']
 
-  s.dependency 'nanopb', '~> 2.30906.0'
+  s.dependency 'nanopb', '~> 2.30907.0'
 
   header_search_paths = {
     'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}/"'

GoogleDataTransport/GDTCCTLibrary/Protogen/nanopb/cct.nanopb.c

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #include "GoogleDataTransport/GDTCCTLibrary/Protogen/nanopb/cct.nanopb.h"
 

GoogleDataTransport/GDTCCTLibrary/Protogen/nanopb/cct.nanopb.h

@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.6 */
+/* Generated by nanopb-0.3.9.7 */
 
 #ifndef PB_GDT_CCT_CCT_NANOPB_H_INCLUDED
 #define PB_GDT_CCT_CCT_NANOPB_H_INCLUDED

GoogleDataTransport/ProtoSupport/README.md

@@ -1,4 +1,4 @@
 To build the protos:
 - `brew install protobuf`
-- Download the latest stable release from https://github.com/nanopb/nanopb/releases
-- `./build_protos.sh <path to nanopb download>`
+- Verify version in generate_cct_protos.sh
+- `./generate_cct_protos.sh`

GoogleDataTransport/ProtoSupport/generate_cct_protos.sh

@@ -23,7 +23,7 @@
 readonly DIR="$( git rev-parse --show-toplevel )"
 
 # Current release of nanopb being used  to build the CCT protos
-readonly NANOPB_VERSION="0.3.9.6"
+readonly NANOPB_VERSION="0.3.9.7"
 readonly NANOPB_TEMPDIR="${DIR}/GoogleDataTransport/nanopb_temp"
 
 readonly LIBRARY_DIR="${DIR}/GoogleDataTransport/GDTCCTLibrary/"

cmake/external/nanopb.cmake

@@ -19,14 +19,14 @@ if(TARGET nanopb)
   return()
 endif()
 
-set(version 0.3.9.6)
+set(version 0.3.9.7)
 
 ExternalProject_Add(
   nanopb
 
   DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
   URL https://github.com/nanopb/nanopb/archive/nanopb-${version}.tar.gz
-  URL_HASH SHA256=d7aa78e637ba2d5b6fbe831f4ee1ee9463f4e4e4d6052db7fdfcd1558ee78afc
+  URL_HASH SHA256=dcb96a5045364f64aee6853dee4e766024fb86718db81e059d211e8a650d8732
 
   PREFIX ${PROJECT_BINARY_DIR}
 

scripts/check_whitespace.sh

@@ -25,7 +25,11 @@ options=(
   ' $'
 )
 
+# TODO(https://github.com/nanopb/nanopb/pull/622) remove Protogen exceptions
+# likely in a nanopb release after 0.3.9.7.
+
 git grep "${options[@]}" -- \
+    ':(exclude)Crashlytics/Protogen/nanopb' \
     ':(exclude)Crashlytics/ProtoSupport' \
     ':(exclude)Crashlytics/UnitTests/Data' \
     ':(exclude)Firebase/CoreDiagnostics/FIRCDLibrary/Protogen/nanopb' \