Update Firestore sources for nanopb 0.3.9.5 (#5481)

paulb777 · web-flow · commit 3d573f971485 · 2020-04-27T17:07:11.000-07:00
diff --git a/Firestore/Protos/README.md b/Firestore/Protos/README.md
@@ -16,6 +16,12 @@ make -j generate_protos
 
 Verify diffs, make sure tests still pass, and create a PR.
 
+### Updating to a new nanopb version:
+  * Modify verion in [nanopb.cmake](cmake/external/nanopb.cmake).
+  * Build.
+  * Note build failure.
+  * Plug expected hash into [nanopb.cmake](cmake/external/nanopb.cmake).
+
 ### Script Details
 
 Get the protoc and the gRPC plugin. See
diff --git a/Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.cc b/Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #include "maybe_document.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.h b/Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #ifndef PB_FIRESTORE_CLIENT_MAYBE_DOCUMENT_NANOPB_H_INCLUDED
 #define PB_FIRESTORE_CLIENT_MAYBE_DOCUMENT_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.cc b/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #include "mutation.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.h b/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #ifndef PB_FIRESTORE_CLIENT_MUTATION_NANOPB_H_INCLUDED
 #define PB_FIRESTORE_CLIENT_MUTATION_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/firestore/local/target.nanopb.cc b/Firestore/Protos/nanopb/firestore/local/target.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #include "target.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/firestore/local/target.nanopb.h b/Firestore/Protos/nanopb/firestore/local/target.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #ifndef PB_FIRESTORE_CLIENT_TARGET_NANOPB_H_INCLUDED
 #define PB_FIRESTORE_CLIENT_TARGET_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/api/annotations.nanopb.cc b/Firestore/Protos/nanopb/google/api/annotations.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #include "annotations.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/api/annotations.nanopb.h b/Firestore/Protos/nanopb/google/api/annotations.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #ifndef PB_GOOGLE_API_ANNOTATIONS_NANOPB_H_INCLUDED
 #define PB_GOOGLE_API_ANNOTATIONS_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/api/http.nanopb.cc b/Firestore/Protos/nanopb/google/api/http.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #include "http.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/api/http.nanopb.h b/Firestore/Protos/nanopb/google/api/http.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #ifndef PB_GOOGLE_API_HTTP_NANOPB_H_INCLUDED
 #define PB_GOOGLE_API_HTTP_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/common.nanopb.cc b/Firestore/Protos/nanopb/google/firestore/v1/common.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #include "common.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/common.nanopb.h b/Firestore/Protos/nanopb/google/firestore/v1/common.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #ifndef PB_GOOGLE_FIRESTORE_V1_COMMON_NANOPB_H_INCLUDED
 #define PB_GOOGLE_FIRESTORE_V1_COMMON_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/document.nanopb.cc b/Firestore/Protos/nanopb/google/firestore/v1/document.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #include "document.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/document.nanopb.h b/Firestore/Protos/nanopb/google/firestore/v1/document.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #ifndef PB_GOOGLE_FIRESTORE_V1_DOCUMENT_NANOPB_H_INCLUDED
 #define PB_GOOGLE_FIRESTORE_V1_DOCUMENT_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.cc b/Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #include "firestore.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.h b/Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #ifndef PB_GOOGLE_FIRESTORE_V1_FIRESTORE_NANOPB_H_INCLUDED
 #define PB_GOOGLE_FIRESTORE_V1_FIRESTORE_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/query.nanopb.cc b/Firestore/Protos/nanopb/google/firestore/v1/query.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #include "query.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/query.nanopb.h b/Firestore/Protos/nanopb/google/firestore/v1/query.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #ifndef PB_GOOGLE_FIRESTORE_V1_QUERY_NANOPB_H_INCLUDED
 #define PB_GOOGLE_FIRESTORE_V1_QUERY_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/write.nanopb.cc b/Firestore/Protos/nanopb/google/firestore/v1/write.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #include "write.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/write.nanopb.h b/Firestore/Protos/nanopb/google/firestore/v1/write.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #ifndef PB_GOOGLE_FIRESTORE_V1_WRITE_NANOPB_H_INCLUDED
 #define PB_GOOGLE_FIRESTORE_V1_WRITE_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/protobuf/any.nanopb.cc b/Firestore/Protos/nanopb/google/protobuf/any.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #include "any.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/protobuf/any.nanopb.h b/Firestore/Protos/nanopb/google/protobuf/any.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #ifndef PB_GOOGLE_PROTOBUF_ANY_NANOPB_H_INCLUDED
 #define PB_GOOGLE_PROTOBUF_ANY_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/protobuf/empty.nanopb.cc b/Firestore/Protos/nanopb/google/protobuf/empty.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #include "empty.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/protobuf/empty.nanopb.h b/Firestore/Protos/nanopb/google/protobuf/empty.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #ifndef PB_GOOGLE_PROTOBUF_EMPTY_NANOPB_H_INCLUDED
 #define PB_GOOGLE_PROTOBUF_EMPTY_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/protobuf/struct.nanopb.cc b/Firestore/Protos/nanopb/google/protobuf/struct.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #include "struct.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/protobuf/struct.nanopb.h b/Firestore/Protos/nanopb/google/protobuf/struct.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #ifndef PB_GOOGLE_PROTOBUF_STRUCT_NANOPB_H_INCLUDED
 #define PB_GOOGLE_PROTOBUF_STRUCT_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/protobuf/timestamp.nanopb.cc b/Firestore/Protos/nanopb/google/protobuf/timestamp.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #include "timestamp.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/protobuf/timestamp.nanopb.h b/Firestore/Protos/nanopb/google/protobuf/timestamp.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #ifndef PB_GOOGLE_PROTOBUF_TIMESTAMP_NANOPB_H_INCLUDED
 #define PB_GOOGLE_PROTOBUF_TIMESTAMP_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/protobuf/wrappers.nanopb.cc b/Firestore/Protos/nanopb/google/protobuf/wrappers.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #include "wrappers.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/protobuf/wrappers.nanopb.h b/Firestore/Protos/nanopb/google/protobuf/wrappers.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #ifndef PB_GOOGLE_PROTOBUF_WRAPPERS_NANOPB_H_INCLUDED
 #define PB_GOOGLE_PROTOBUF_WRAPPERS_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/rpc/status.nanopb.cc b/Firestore/Protos/nanopb/google/rpc/status.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #include "status.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/rpc/status.nanopb.h b/Firestore/Protos/nanopb/google/rpc/status.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #ifndef PB_GOOGLE_RPC_STATUS_NANOPB_H_INCLUDED
 #define PB_GOOGLE_RPC_STATUS_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/type/latlng.nanopb.cc b/Firestore/Protos/nanopb/google/type/latlng.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #include "latlng.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/type/latlng.nanopb.h b/Firestore/Protos/nanopb/google/type/latlng.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.2 */
+/* Generated by nanopb-0.3.9.5 */
 
 #ifndef PB_GOOGLE_TYPE_LATLNG_NANOPB_H_INCLUDED
 #define PB_GOOGLE_TYPE_LATLNG_NANOPB_H_INCLUDED
diff --git a/cmake/external/nanopb.cmake b/cmake/external/nanopb.cmake
@@ -19,14 +19,14 @@ if(TARGET nanopb)
   return()
 endif()
 
-set(version 0.3.9.2)
+set(version 0.3.9.5)
 
 ExternalProject_Add(
   nanopb
 
   DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
   URL https://github.com/nanopb/nanopb/archive/nanopb-${version}.tar.gz
-  URL_HASH SHA256=9a5a67e5be384803c9d09ffd4fc04d9a1a9fad10d4e30390134cea216e958251
+  URL_HASH SHA256=c14ac70128bd019c48d8b35d5a4923ea98aa769b930f6cf07ac2c223babdb5ca
 
   PREFIX ${PROJECT_BINARY_DIR}
 
