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.

1 files changed, 189 insertions, 0 deletions

diff --git a/Firestore/Protos/nanopb/google/firestore/v1beta1/write.nanopb.h b/Firestore/Protos/nanopb/google/firestore/v1beta1/write.nanopb.h
new file mode 100644
index 0000000..4c4e6ba
--- /dev/null
+++ b/Firestore/Protos/nanopb/google/firestore/v1beta1/write.nanopb.h
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2018 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Automatically generated nanopb header */
+/* Generated by nanopb-0.3.8 at Fri Jun  1 18:36:44 2018. */
+
+#ifndef PB_GOOGLE_FIRESTORE_V1BETA1_WRITE_PB_H_INCLUDED
+#define PB_GOOGLE_FIRESTORE_V1BETA1_WRITE_PB_H_INCLUDED
+#include <pb.h>
+
+#include "google/api/annotations.nanopb.h"
+
+#include "google/firestore/v1beta1/common.nanopb.h"
+
+#include "google/firestore/v1beta1/document.nanopb.h"
+
+#include "google/protobuf/timestamp.nanopb.h"
+
+/* @@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
+
+/* Enum definitions */
+typedef enum _google_firestore_v1beta1_DocumentTransform_FieldTransform_ServerValue {
+    google_firestore_v1beta1_DocumentTransform_FieldTransform_ServerValue_SERVER_VALUE_UNSPECIFIED = 0,
+    google_firestore_v1beta1_DocumentTransform_FieldTransform_ServerValue_REQUEST_TIME = 1
+} google_firestore_v1beta1_DocumentTransform_FieldTransform_ServerValue;
+#define _google_firestore_v1beta1_DocumentTransform_FieldTransform_ServerValue_MIN google_firestore_v1beta1_DocumentTransform_FieldTransform_ServerValue_SERVER_VALUE_UNSPECIFIED
+#define _google_firestore_v1beta1_DocumentTransform_FieldTransform_ServerValue_MAX google_firestore_v1beta1_DocumentTransform_FieldTransform_ServerValue_REQUEST_TIME
+#define _google_firestore_v1beta1_DocumentTransform_FieldTransform_ServerValue_ARRAYSIZE ((google_firestore_v1beta1_DocumentTransform_FieldTransform_ServerValue)(google_firestore_v1beta1_DocumentTransform_FieldTransform_ServerValue_REQUEST_TIME+1))
+
+/* Struct definitions */
+typedef struct _google_firestore_v1beta1_DocumentTransform {
+    pb_callback_t document;
+    pb_callback_t field_transforms;
+/* @@protoc_insertion_point(struct:google_firestore_v1beta1_DocumentTransform) */
+} google_firestore_v1beta1_DocumentTransform;
+
+typedef struct _google_firestore_v1beta1_DocumentChange {
+    google_firestore_v1beta1_Document document;
+    pb_callback_t target_ids;
+    pb_callback_t removed_target_ids;
+/* @@protoc_insertion_point(struct:google_firestore_v1beta1_DocumentChange) */
+} google_firestore_v1beta1_DocumentChange;
+
+typedef struct _google_firestore_v1beta1_DocumentDelete {
+    pb_callback_t document;
+    google_protobuf_Timestamp read_time;
+    pb_callback_t removed_target_ids;
+/* @@protoc_insertion_point(struct:google_firestore_v1beta1_DocumentDelete) */
+} google_firestore_v1beta1_DocumentDelete;
+
+typedef struct _google_firestore_v1beta1_DocumentRemove {
+    pb_callback_t document;
+    pb_callback_t removed_target_ids;
+    google_protobuf_Timestamp read_time;
+/* @@protoc_insertion_point(struct:google_firestore_v1beta1_DocumentRemove) */
+} google_firestore_v1beta1_DocumentRemove;
+
+typedef struct _google_firestore_v1beta1_DocumentTransform_FieldTransform {
+    pb_callback_t field_path;
+    pb_size_t which_transform_type;
+    union {
+        google_firestore_v1beta1_DocumentTransform_FieldTransform_ServerValue set_to_server_value;
+        google_firestore_v1beta1_ArrayValue append_missing_elements;
+        google_firestore_v1beta1_ArrayValue remove_all_from_array;
+    } transform_type;
+/* @@protoc_insertion_point(struct:google_firestore_v1beta1_DocumentTransform_FieldTransform) */
+} google_firestore_v1beta1_DocumentTransform_FieldTransform;
+
+typedef struct _google_firestore_v1beta1_ExistenceFilter {
+    int32_t target_id;
+    int32_t count;
+/* @@protoc_insertion_point(struct:google_firestore_v1beta1_ExistenceFilter) */
+} google_firestore_v1beta1_ExistenceFilter;
+
+typedef struct _google_firestore_v1beta1_Write {
+    google_firestore_v1beta1_Document update;
+    pb_callback_t delete_;
+    google_firestore_v1beta1_DocumentMask update_mask;
+    google_firestore_v1beta1_Precondition current_document;
+    google_firestore_v1beta1_DocumentTransform transform;
+/* @@protoc_insertion_point(struct:google_firestore_v1beta1_Write) */
+} google_firestore_v1beta1_Write;
+
+typedef struct _google_firestore_v1beta1_WriteResult {
+    google_protobuf_Timestamp update_time;
+    pb_callback_t transform_results;
+/* @@protoc_insertion_point(struct:google_firestore_v1beta1_WriteResult) */
+} google_firestore_v1beta1_WriteResult;
+
+/* Default values for struct fields */
+
+/* Initializer values for message structs */
+#define google_firestore_v1beta1_Write_init_default {google_firestore_v1beta1_Document_init_default, {{NULL}, NULL}, google_firestore_v1beta1_DocumentMask_init_default, google_firestore_v1beta1_Precondition_init_default, google_firestore_v1beta1_DocumentTransform_init_default}
+#define google_firestore_v1beta1_DocumentTransform_init_default {{{NULL}, NULL}, {{NULL}, NULL}}
+#define google_firestore_v1beta1_DocumentTransform_FieldTransform_init_default {{{NULL}, NULL}, 0, {(google_firestore_v1beta1_DocumentTransform_FieldTransform_ServerValue)0}}
+#define google_firestore_v1beta1_WriteResult_init_default {google_protobuf_Timestamp_init_default, {{NULL}, NULL}}
+#define google_firestore_v1beta1_DocumentChange_init_default {google_firestore_v1beta1_Document_init_default, {{NULL}, NULL}, {{NULL}, NULL}}
+#define google_firestore_v1beta1_DocumentDelete_init_default {{{NULL}, NULL}, google_protobuf_Timestamp_init_default, {{NULL}, NULL}}
+#define google_firestore_v1beta1_DocumentRemove_init_default {{{NULL}, NULL}, {{NULL}, NULL}, google_protobuf_Timestamp_init_default}
+#define google_firestore_v1beta1_ExistenceFilter_init_default {0, 0}
+#define google_firestore_v1beta1_Write_init_zero {google_firestore_v1beta1_Document_init_zero, {{NULL}, NULL}, google_firestore_v1beta1_DocumentMask_init_zero, google_firestore_v1beta1_Precondition_init_zero, google_firestore_v1beta1_DocumentTransform_init_zero}
+#define google_firestore_v1beta1_DocumentTransform_init_zero {{{NULL}, NULL}, {{NULL}, NULL}}
+#define google_firestore_v1beta1_DocumentTransform_FieldTransform_init_zero {{{NULL}, NULL}, 0, {(google_firestore_v1beta1_DocumentTransform_FieldTransform_ServerValue)0}}
+#define google_firestore_v1beta1_WriteResult_init_zero {google_protobuf_Timestamp_init_zero, {{NULL}, NULL}}
+#define google_firestore_v1beta1_DocumentChange_init_zero {google_firestore_v1beta1_Document_init_zero, {{NULL}, NULL}, {{NULL}, NULL}}
+#define google_firestore_v1beta1_DocumentDelete_init_zero {{{NULL}, NULL}, google_protobuf_Timestamp_init_zero, {{NULL}, NULL}}
+#define google_firestore_v1beta1_DocumentRemove_init_zero {{{NULL}, NULL}, {{NULL}, NULL}, google_protobuf_Timestamp_init_zero}
+#define google_firestore_v1beta1_ExistenceFilter_init_zero {0, 0}
+
+/* Field tags (for use in manual encoding/decoding) */
+#define google_firestore_v1beta1_DocumentTransform_document_tag 1
+#define google_firestore_v1beta1_DocumentTransform_field_transforms_tag 2
+#define google_firestore_v1beta1_DocumentChange_document_tag 1
+#define google_firestore_v1beta1_DocumentChange_target_ids_tag 5
+#define google_firestore_v1beta1_DocumentChange_removed_target_ids_tag 6
+#define google_firestore_v1beta1_DocumentDelete_document_tag 1
+#define google_firestore_v1beta1_DocumentDelete_removed_target_ids_tag 6
+#define google_firestore_v1beta1_DocumentDelete_read_time_tag 4
+#define google_firestore_v1beta1_DocumentRemove_document_tag 1
+#define google_firestore_v1beta1_DocumentRemove_removed_target_ids_tag 2
+#define google_firestore_v1beta1_DocumentRemove_read_time_tag 4
+#define google_firestore_v1beta1_DocumentTransform_FieldTransform_set_to_server_value_tag 2
+#define google_firestore_v1beta1_DocumentTransform_FieldTransform_append_missing_elements_tag 6
+#define google_firestore_v1beta1_DocumentTransform_FieldTransform_remove_all_from_array_tag 7
+#define google_firestore_v1beta1_DocumentTransform_FieldTransform_field_path_tag 1
+#define google_firestore_v1beta1_ExistenceFilter_target_id_tag 1
+#define google_firestore_v1beta1_ExistenceFilter_count_tag 2
+#define google_firestore_v1beta1_Write_update_tag 1
+#define google_firestore_v1beta1_Write_delete_tag 2
+#define google_firestore_v1beta1_Write_transform_tag 6
+#define google_firestore_v1beta1_Write_update_mask_tag 3
+#define google_firestore_v1beta1_Write_current_document_tag 4
+#define google_firestore_v1beta1_WriteResult_update_time_tag 1
+#define google_firestore_v1beta1_WriteResult_transform_results_tag 2
+
+/* Struct field encoding specification for nanopb */
+extern const pb_field_t google_firestore_v1beta1_Write_fields[6];
+extern const pb_field_t google_firestore_v1beta1_DocumentTransform_fields[3];
+extern const pb_field_t google_firestore_v1beta1_DocumentTransform_FieldTransform_fields[5];
+extern const pb_field_t google_firestore_v1beta1_WriteResult_fields[3];
+extern const pb_field_t google_firestore_v1beta1_DocumentChange_fields[4];
+extern const pb_field_t google_firestore_v1beta1_DocumentDelete_fields[4];
+extern const pb_field_t google_firestore_v1beta1_DocumentRemove_fields[4];
+extern const pb_field_t google_firestore_v1beta1_ExistenceFilter_fields[3];
+
+/* Maximum encoded size of messages (where known) */
+/* google_firestore_v1beta1_Write_size depends on runtime parameters */
+/* google_firestore_v1beta1_DocumentTransform_size depends on runtime parameters */
+/* google_firestore_v1beta1_DocumentTransform_FieldTransform_size depends on runtime parameters */
+/* google_firestore_v1beta1_WriteResult_size depends on runtime parameters */
+/* google_firestore_v1beta1_DocumentChange_size depends on runtime parameters */
+/* google_firestore_v1beta1_DocumentDelete_size depends on runtime parameters */
+/* google_firestore_v1beta1_DocumentRemove_size depends on runtime parameters */
+#define google_firestore_v1beta1_ExistenceFilter_size 22
+
+/* Message IDs (where set with "msgid" option) */
+#ifdef PB_MSGID
+
+#define WRITE_MESSAGES \
+
+
+#endif
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+/* @@protoc_insertion_point(eof) */
+
+#endif