Merge remote-tracking branch 'origin/master' into rsgowman/protobuf_cpp

Also "fixed" BadFieldValueTagWithOtherValidTagsPresent test by changing
'false' to 'true'. Details: Depending on the version of nanopb, nanopb
would explicitly encode 'false', which shouldn't be done in proto3. When
it's explicitly encoded, the test worked properly. But when it was
(properly) dropped, the invalid tag is the only field that's actually
encoded, thus violating the assumptions of the test, leading to a test
failure. s/false/true fixes it, as now the boolean_value field is
(properly) encoded regardless of version.

6 files changed, 15 insertions, 15 deletions

diff --git a/Firestore/Protos/nanopb/firestore/local/maybe_document.pb.h b/Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.h
index b159cd1..0b9aa68 100644
--- a/Firestore/Protos/nanopb/firestore/local/maybe_document.pb.h
+++ b/Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.h
@@ -15,15 +15,15 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.8 at Fri Feb  2 17:48:02 2018. */
+/* Generated by nanopb-0.3.8 at Fri Jun  1 18:36:44 2018. */
 
 #ifndef PB_FIRESTORE_CLIENT_MAYBE_DOCUMENT_PB_H_INCLUDED
 #define PB_FIRESTORE_CLIENT_MAYBE_DOCUMENT_PB_H_INCLUDED
 #include <pb.h>
 
-#include "google/firestore/v1beta1/document.pb.h"
+#include "google/firestore/v1beta1/document.nanopb.h"
 
-#include "google/protobuf/timestamp.pb.h"
+#include "google/protobuf/timestamp.nanopb.h"
 
 /* @@protoc_insertion_point(includes) */
 #if PB_PROTO_HEADER_VERSION != 30
diff --git a/Firestore/Protos/nanopb/firestore/local/maybe_document.pb.c b/Firestore/Protos/nanopb/firestore/local/maybe_document.pb.c
index 7cd4035..e528816 100644
--- a/Firestore/Protos/nanopb/firestore/local/maybe_document.pb.c
+++ b/Firestore/Protos/nanopb/firestore/local/maybe_document.pb.c
@@ -15,9 +15,9 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.8 at Fri Feb  2 17:48:02 2018. */
+/* Generated by nanopb-0.3.8 at Fri Jun  1 18:36:44 2018. */
 
-#include "maybe_document.pb.h"
+#include "maybe_document.nanopb.h"
 
 /* @@protoc_insertion_point(includes) */
 #if PB_PROTO_HEADER_VERSION != 30
diff --git a/Firestore/Protos/nanopb/firestore/local/mutation.pb.h b/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.h
index 537d0cd..c3b2b96 100644
--- a/Firestore/Protos/nanopb/firestore/local/mutation.pb.h
+++ b/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.h
@@ -15,15 +15,15 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.8 at Fri Feb  2 17:48:02 2018. */
+/* Generated by nanopb-0.3.8 at Fri Jun  1 18:36:44 2018. */
 
 #ifndef PB_FIRESTORE_CLIENT_MUTATION_PB_H_INCLUDED
 #define PB_FIRESTORE_CLIENT_MUTATION_PB_H_INCLUDED
 #include <pb.h>
 
-#include "google/firestore/v1beta1/write.pb.h"
+#include "google/firestore/v1beta1/write.nanopb.h"
 
-#include "google/protobuf/timestamp.pb.h"
+#include "google/protobuf/timestamp.nanopb.h"
 
 /* @@protoc_insertion_point(includes) */
 #if PB_PROTO_HEADER_VERSION != 30
diff --git a/Firestore/Protos/nanopb/firestore/local/mutation.pb.c b/Firestore/Protos/nanopb/firestore/local/mutation.pb.c
index 7dedb14..12725ce 100644
--- a/Firestore/Protos/nanopb/firestore/local/mutation.pb.c
+++ b/Firestore/Protos/nanopb/firestore/local/mutation.pb.c
@@ -15,9 +15,9 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.8 at Fri Feb  2 17:48:02 2018. */
+/* Generated by nanopb-0.3.8 at Fri Jun  1 18:36:44 2018. */
 
-#include "mutation.pb.h"
+#include "mutation.nanopb.h"
 
 /* @@protoc_insertion_point(includes) */
 #if PB_PROTO_HEADER_VERSION != 30
diff --git a/Firestore/Protos/nanopb/firestore/local/target.pb.h b/Firestore/Protos/nanopb/firestore/local/target.nanopb.h
index 37b64a2..af6cf9c 100644
--- a/Firestore/Protos/nanopb/firestore/local/target.pb.h
+++ b/Firestore/Protos/nanopb/firestore/local/target.nanopb.h
@@ -15,15 +15,15 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.8 at Mon Apr  9 15:08:47 2018. */
+/* Generated by nanopb-0.3.8 at Fri Jun  1 18:36:44 2018. */
 
 #ifndef PB_FIRESTORE_CLIENT_TARGET_PB_H_INCLUDED
 #define PB_FIRESTORE_CLIENT_TARGET_PB_H_INCLUDED
 #include <pb.h>
 
-#include "google/firestore/v1beta1/firestore.pb.h"
+#include "google/firestore/v1beta1/firestore.nanopb.h"
 
-#include "google/protobuf/timestamp.pb.h"
+#include "google/protobuf/timestamp.nanopb.h"
 
 /* @@protoc_insertion_point(includes) */
 #if PB_PROTO_HEADER_VERSION != 30
diff --git a/Firestore/Protos/nanopb/firestore/local/target.pb.c b/Firestore/Protos/nanopb/firestore/local/target.pb.c
index d00d4a6..7a68c4a 100644
--- a/Firestore/Protos/nanopb/firestore/local/target.pb.c
+++ b/Firestore/Protos/nanopb/firestore/local/target.pb.c
@@ -15,9 +15,9 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.8 at Mon Apr  9 15:08:47 2018. */
+/* Generated by nanopb-0.3.8 at Fri Jun  1 18:36:44 2018. */
 
-#include "target.pb.h"
+#include "target.nanopb.h"
 
 /* @@protoc_insertion_point(includes) */
 #if PB_PROTO_HEADER_VERSION != 30