Skip to content

Migrate Firestore to the v1 protocol #2200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Dec 21, 2018
Merged

Migrate Firestore to the v1 protocol #2200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9638fc8
Use python executable directly
wilhuff Dec 13, 2018
3410120
Add Firestore v1 protos
wilhuff Dec 12, 2018
b32f699
Make local protos refer to v1 protos
wilhuff Dec 13, 2018
9a39878
Point cmake at Firestore v1 protos
wilhuff Dec 12, 2018
8a51f94
Regenerate protobuf-related sources
wilhuff Dec 12, 2018
e5927f5
fixup! Regenerate protobuf-related sources
wilhuff Dec 20, 2018
6f9026c
Remove v1beta1 protos
wilhuff Dec 12, 2018
c9fa869
s/v1beta1/v1/g in source.
wilhuff Dec 13, 2018
baa8c84
s/v1beta1/v1/ in the Xcode project
wilhuff Dec 13, 2018
c8cc05e
Remove stale bug comments.
wilhuff Dec 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions Firestore/Example/Firestore.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@
3B843E4C1F3A182900548890 /* remote_store_spec_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 3B843E4A1F3930A400548890 /* remote_store_spec_test.json */; };
4AA4ABE36065DB79CD76DD8D /* Pods_Firestore_Benchmarks_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F694C3CE4B77B3C0FA4BBA53 /* Pods_Firestore_Benchmarks_iOS.framework */; };
54131E9720ADE679001DF3FF /* string_format_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 54131E9620ADE678001DF3FF /* string_format_test.cc */; };
544129DA21C2DDC800EFB9CC /* common.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 544129D221C2DDC800EFB9CC /* common.pb.cc */; };
544129DB21C2DDC800EFB9CC /* firestore.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 544129D421C2DDC800EFB9CC /* firestore.pb.cc */; };
544129DC21C2DDC800EFB9CC /* query.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 544129D621C2DDC800EFB9CC /* query.pb.cc */; };
544129DD21C2DDC800EFB9CC /* document.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 544129D821C2DDC800EFB9CC /* document.pb.cc */; };
544129DE21C2DDC800EFB9CC /* write.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 544129D921C2DDC800EFB9CC /* write.pb.cc */; };
544A20EE20F6C10C004E52CD /* BasicCompileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE0761F61F2FE68D003233AF /* BasicCompileTests.swift */; };
54511E8E209805F8005BD28F /* hashing_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 54511E8D209805F8005BD28F /* hashing_test.cc */; };
5467FB01203E5717009C9584 /* FIRFirestoreTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5467FAFF203E56F8009C9584 /* FIRFirestoreTests.mm */; };
Expand Down Expand Up @@ -156,11 +161,6 @@
618BBEA620B89AAC00B5BCE7 /* target.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE7D20B89AAC00B5BCE7 /* target.pb.cc */; };
618BBEA720B89AAC00B5BCE7 /* maybe_document.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE7E20B89AAC00B5BCE7 /* maybe_document.pb.cc */; };
618BBEA820B89AAC00B5BCE7 /* mutation.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE8220B89AAC00B5BCE7 /* mutation.pb.cc */; };
618BBEA920B89AAC00B5BCE7 /* common.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE8820B89AAC00B5BCE7 /* common.pb.cc */; };
618BBEAA20B89AAC00B5BCE7 /* firestore.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE8A20B89AAC00B5BCE7 /* firestore.pb.cc */; };
618BBEAB20B89AAC00B5BCE7 /* query.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE8C20B89AAC00B5BCE7 /* query.pb.cc */; };
618BBEAC20B89AAC00B5BCE7 /* document.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE8E20B89AAC00B5BCE7 /* document.pb.cc */; };
618BBEAD20B89AAC00B5BCE7 /* write.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE8F20B89AAC00B5BCE7 /* write.pb.cc */; };
618BBEAE20B89AAC00B5BCE7 /* latlng.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE9220B89AAC00B5BCE7 /* latlng.pb.cc */; };
618BBEAF20B89AAC00B5BCE7 /* annotations.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE9520B89AAC00B5BCE7 /* annotations.pb.cc */; };
618BBEB020B89AAC00B5BCE7 /* http.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE9720B89AAC00B5BCE7 /* http.pb.cc */; };
Expand Down Expand Up @@ -313,6 +313,16 @@
403DBF6EFB541DFD01582AA3 /* path_test.cc */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; path = path_test.cc; sourceTree = "<group>"; };
444B7AB3F5A2929070CB1363 /* hard_assert_test.cc */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; path = hard_assert_test.cc; sourceTree = "<group>"; };
54131E9620ADE678001DF3FF /* string_format_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_format_test.cc; sourceTree = "<group>"; };
544129D021C2DDC800EFB9CC /* query.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = query.pb.h; sourceTree = "<group>"; };
544129D121C2DDC800EFB9CC /* common.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = common.pb.h; sourceTree = "<group>"; };
544129D221C2DDC800EFB9CC /* common.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = common.pb.cc; sourceTree = "<group>"; };
544129D321C2DDC800EFB9CC /* firestore.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = firestore.pb.h; sourceTree = "<group>"; };
544129D421C2DDC800EFB9CC /* firestore.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = firestore.pb.cc; sourceTree = "<group>"; };
544129D521C2DDC800EFB9CC /* write.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = write.pb.h; sourceTree = "<group>"; };
544129D621C2DDC800EFB9CC /* query.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = query.pb.cc; sourceTree = "<group>"; };
544129D721C2DDC800EFB9CC /* document.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = document.pb.h; sourceTree = "<group>"; };
544129D821C2DDC800EFB9CC /* document.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = document.pb.cc; sourceTree = "<group>"; };
544129D921C2DDC800EFB9CC /* write.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = write.pb.cc; sourceTree = "<group>"; };
54511E8D209805F8005BD28F /* hashing_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hashing_test.cc; sourceTree = "<group>"; };
5467FAFF203E56F8009C9584 /* FIRFirestoreTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FIRFirestoreTests.mm; sourceTree = "<group>"; };
5467FB06203E6A44009C9584 /* app_testing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = app_testing.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -456,16 +466,6 @@
618BBE8020B89AAC00B5BCE7 /* maybe_document.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maybe_document.pb.h; sourceTree = "<group>"; };
618BBE8120B89AAC00B5BCE7 /* mutation.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mutation.pb.h; sourceTree = "<group>"; };
618BBE8220B89AAC00B5BCE7 /* mutation.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mutation.pb.cc; sourceTree = "<group>"; };
618BBE8620B89AAC00B5BCE7 /* query.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = query.pb.h; sourceTree = "<group>"; };
618BBE8720B89AAC00B5BCE7 /* common.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = common.pb.h; sourceTree = "<group>"; };
618BBE8820B89AAC00B5BCE7 /* common.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = common.pb.cc; sourceTree = "<group>"; };
618BBE8920B89AAC00B5BCE7 /* firestore.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = firestore.pb.h; sourceTree = "<group>"; };
618BBE8A20B89AAC00B5BCE7 /* firestore.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = firestore.pb.cc; sourceTree = "<group>"; };
618BBE8B20B89AAC00B5BCE7 /* write.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = write.pb.h; sourceTree = "<group>"; };
618BBE8C20B89AAC00B5BCE7 /* query.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = query.pb.cc; sourceTree = "<group>"; };
618BBE8D20B89AAC00B5BCE7 /* document.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = document.pb.h; sourceTree = "<group>"; };
618BBE8E20B89AAC00B5BCE7 /* document.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = document.pb.cc; sourceTree = "<group>"; };
618BBE8F20B89AAC00B5BCE7 /* write.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = write.pb.cc; sourceTree = "<group>"; };
618BBE9120B89AAC00B5BCE7 /* latlng.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = latlng.pb.h; sourceTree = "<group>"; };
618BBE9220B89AAC00B5BCE7 /* latlng.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = latlng.pb.cc; sourceTree = "<group>"; };
618BBE9420B89AAC00B5BCE7 /* http.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = http.pb.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -640,6 +640,23 @@
path = App;
sourceTree = "<group>";
};
544129CF21C2DDC800EFB9CC /* v1 */ = {
isa = PBXGroup;
children = (
544129D221C2DDC800EFB9CC /* common.pb.cc */,
544129D121C2DDC800EFB9CC /* common.pb.h */,
544129D821C2DDC800EFB9CC /* document.pb.cc */,
544129D721C2DDC800EFB9CC /* document.pb.h */,
544129D421C2DDC800EFB9CC /* firestore.pb.cc */,
544129D321C2DDC800EFB9CC /* firestore.pb.h */,
544129D621C2DDC800EFB9CC /* query.pb.cc */,
544129D021C2DDC800EFB9CC /* query.pb.h */,
544129D921C2DDC800EFB9CC /* write.pb.cc */,
544129D521C2DDC800EFB9CC /* write.pb.h */,
);
path = v1;
sourceTree = "<group>";
};
544A20ED20F6C046004E52CD /* API */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -940,28 +957,11 @@
618BBE8420B89AAC00B5BCE7 /* firestore */ = {
isa = PBXGroup;
children = (
618BBE8520B89AAC00B5BCE7 /* v1beta1 */,
544129CF21C2DDC800EFB9CC /* v1 */,
);
path = firestore;
sourceTree = "<group>";
};
618BBE8520B89AAC00B5BCE7 /* v1beta1 */ = {
isa = PBXGroup;
children = (
618BBE8820B89AAC00B5BCE7 /* common.pb.cc */,
618BBE8720B89AAC00B5BCE7 /* common.pb.h */,
618BBE8E20B89AAC00B5BCE7 /* document.pb.cc */,
618BBE8D20B89AAC00B5BCE7 /* document.pb.h */,
618BBE8A20B89AAC00B5BCE7 /* firestore.pb.cc */,
618BBE8920B89AAC00B5BCE7 /* firestore.pb.h */,
618BBE8C20B89AAC00B5BCE7 /* query.pb.cc */,
618BBE8620B89AAC00B5BCE7 /* query.pb.h */,
618BBE8F20B89AAC00B5BCE7 /* write.pb.cc */,
618BBE8B20B89AAC00B5BCE7 /* write.pb.h */,
);
path = v1beta1;
sourceTree = "<group>";
};
618BBE9020B89AAC00B5BCE7 /* type */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1927,14 +1927,14 @@
B6FB467D208E9D3C00554BA2 /* async_queue_test.cc in Sources */,
54740A581FC914F000713A1A /* autoid_test.cc in Sources */,
AB380D02201BC69F00D97691 /* bits_test.cc in Sources */,
618BBEA920B89AAC00B5BCE7 /* common.pb.cc in Sources */,
544129DA21C2DDC800EFB9CC /* common.pb.cc in Sources */,
548DB929200D59F600E00ABC /* comparison_test.cc in Sources */,
B67BF449216EB43000CA9097 /* create_noop_connectivity_monitor.cc in Sources */,
ABC1D7DC2023A04B00BA84F0 /* credentials_provider_test.cc in Sources */,
ABE6637A201FA81900ED349A /* database_id_test.cc in Sources */,
AB38D93020236E21000A432D /* database_info_test.cc in Sources */,
546854AA20A36867004BDBD5 /* datastore_test.mm in Sources */,
618BBEAC20B89AAC00B5BCE7 /* document.pb.cc in Sources */,
544129DD21C2DDC800EFB9CC /* document.pb.cc in Sources */,
B6152AD7202A53CB000E5744 /* document_key_test.cc in Sources */,
AB6B908420322E4D00CC290A /* document_test.cc in Sources */,
ABC1D7DD2023A04F00BA84F0 /* empty_credentials_provider_test.cc in Sources */,
Expand All @@ -1949,7 +1949,7 @@
AB356EF7200EA5EB0089B766 /* field_value_test.cc in Sources */,
D94A1862B8FB778225DB54A1 /* filesystem_test.cc in Sources */,
ABC1D7E42024AFDE00BA84F0 /* firebase_credentials_provider_test.mm in Sources */,
618BBEAA20B89AAC00B5BCE7 /* firestore.pb.cc in Sources */,
544129DB21C2DDC800EFB9CC /* firestore.pb.cc in Sources */,
AB7BAB342012B519001E0872 /* geo_point_test.cc in Sources */,
B6D9649121544D4F00EB9CFB /* grpc_connection_test.cc in Sources */,
B6BBE43121262CF400C6A53E /* grpc_stream_test.cc in Sources */,
Expand All @@ -1973,7 +1973,7 @@
AB380D04201BC6E400D97691 /* ordered_code_test.cc in Sources */,
5A080105CCBFDB6BF3F3772D /* path_test.cc in Sources */,
549CCA5920A36E1F00BCEB75 /* precondition_test.cc in Sources */,
618BBEAB20B89AAC00B5BCE7 /* query.pb.cc in Sources */,
544129DC21C2DDC800EFB9CC /* query.pb.cc in Sources */,
6F3CAC76D918D6B0917EDF92 /* query_test.cc in Sources */,
B686F2B22025000D0028D6BE /* resource_path_test.cc in Sources */,
54740A571FC914BA00713A1A /* secure_random_test.cc in Sources */,
Expand All @@ -2000,7 +2000,7 @@
549CCA5120A36DBC00BCEB75 /* tree_sorted_map_test.cc in Sources */,
C80B10E79CDD7EF7843C321E /* type_traits_apple_test.mm in Sources */,
ABC1D7DE2023A05300BA84F0 /* user_test.cc in Sources */,
618BBEAD20B89AAC00B5BCE7 /* write.pb.cc in Sources */,
544129DE21C2DDC800EFB9CC /* write.pb.cc in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
4 changes: 2 additions & 2 deletions Firestore/Example/FuzzTests/FuzzingResources/Serializer/Corpus/ConvertTextToBinary.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ for text_proto_file in "${text_protos_dir}"/*; do
echo "${file_content}" \
| "${SRCROOT}/Pods/!ProtoCompiler/protoc" \
-I"${SRCROOT}/../../Firestore/Protos/protos" \
--encode=google.firestore.v1beta1."${message_type}" \
google/firestore/v1beta1/document.proto > "${binary_protos_dir}/${file_name}"
--encode=google.firestore.v1."${message_type}" \
google/firestore/v1/document.proto > "${binary_protos_dir}/${file_name}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(github won't let me comment on files not in the PR.)

Check out https://github.com/firebase/firebase-ios-sdk/blob/wilhuff/v1/Firestore/core/src/firebase/firestore/model/field_path.cc#L82 for a missed instance of v1beta1. It's a pretty stale comment, since it refers to moving to v1beta1 rather than away from it. The bug it references has been fixed (1y+ ago)

Fixing the code here is outside the scope of this PR, so this could be deferred.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This just wasn't cleaned up. I've removed the stale comments.

done
10 changes: 5 additions & 5 deletions Firestore/Example/Tests/Local/FSTLocalSerializerTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
#import "Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.h"
#import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h"
#import "Firestore/Protos/objc/firestore/local/Target.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1beta1/Query.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1/Common.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1/Document.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1/Firestore.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1/Query.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1/Write.pbobjc.h"
#import "Firestore/Protos/objc/google/type/Latlng.pbobjc.h"
#import "Firestore/Source/Core/FSTQuery.h"
#import "Firestore/Source/Local/FSTQueryData.h"
Expand Down
6 changes: 3 additions & 3 deletions Firestore/Example/Tests/Model/FSTFieldValueTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ - (void)testWrapsBooleans {
};

- (void)testNormalizesNaNs {
// NOTE: With v1beta1 query semantics, it's no longer as important that our NaN representation
// matches the backend, since all NaNs are defined to sort as equal, but we preserve the
// normalization and this test regardless for now.
// NOTE: With v1 query semantics, it's no longer as important that our NaN representation matches
// the backend, since all NaNs are defined to sort as equal, but we preserve the normalization and
// this test regardless for now.

// We use a canonical NaN bit pattern that's common for both Java and Objective-C. Specifically:
// - sign: 0
Expand Down
10 changes: 5 additions & 5 deletions Firestore/Example/Tests/Remote/FSTSerializerBetaTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@

#import "Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.h"
#import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1beta1/Query.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1/Common.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1/Document.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1/Firestore.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1/Query.pbobjc.h"
#import "Firestore/Protos/objc/google/firestore/v1/Write.pbobjc.h"
#import "Firestore/Protos/objc/google/rpc/Status.pbobjc.h"
#import "Firestore/Protos/objc/google/type/Latlng.pbobjc.h"
#import "Firestore/Source/API/FIRFieldValue+Internal.h"
Expand Down
14 changes: 7 additions & 7 deletions Firestore/Protos/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ set(
firestore/local/target
google/api/annotations
google/api/http
google/firestore/v1beta1/common
google/firestore/v1beta1/document
google/firestore/v1beta1/firestore
google/firestore/v1beta1/query
google/firestore/v1beta1/write
google/firestore/v1/common
google/firestore/v1/document
google/firestore/v1/firestore
google/firestore/v1/query
google/firestore/v1/write
google/rpc/status
google/type/latlng
)
Expand Down Expand Up @@ -113,8 +113,8 @@ endfunction()
# omitted here.
set(
PROTOBUF_OBJC_GENERATED_SOURCES
${OUTPUT_DIR}/objc/google/firestore/v1beta1/Firestore.pbrpc.h
${OUTPUT_DIR}/objc/google/firestore/v1beta1/Firestore.pbrpc.m
${OUTPUT_DIR}/objc/google/firestore/v1/Firestore.pbrpc.h
${OUTPUT_DIR}/objc/google/firestore/v1/Firestore.pbrpc.m
)
foreach(root ${PROTO_FILE_ROOTS})
get_filename_component(dir ${root} DIRECTORY)
Expand Down
Loading