Skip to content

Commit 6af931d

Browse files
wilhuffwilhuff
authored
Migrate Firestore to the v1 protocol (#2200)
* Use python executable directly * python2 is not guaranteed to exist * scripts aren't directly executable on Windows * Add Firestore v1 protos * Point cmake at Firestore v1 protos * Regenerate protobuf-related sources * Make local protos refer to v1 protos * fixup! Regenerate protobuf-related sources * Remove v1beta1 protos * s/v1beta1/v1/g in source. * s/v1beta1/v1/ in the Xcode project * Remove stale bug comments. This was fixed by adding an explicit FieldPath API rather than exposing escaping to the end user.
1 parent fa2cbe7 commit 6af931d

File tree

85 files changed

+7932
-7637
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+7932
-7637
lines changed

‎Firestore/Example/Firestore.xcodeproj/project.pbxproj

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@
3434
3B843E4C1F3A182900548890 /* remote_store_spec_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 3B843E4A1F3930A400548890 /* remote_store_spec_test.json */; };
3535
4AA4ABE36065DB79CD76DD8D /* Pods_Firestore_Benchmarks_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F694C3CE4B77B3C0FA4BBA53 /* Pods_Firestore_Benchmarks_iOS.framework */; };
3636
54131E9720ADE679001DF3FF /* string_format_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 54131E9620ADE678001DF3FF /* string_format_test.cc */; };
37+
544129DA21C2DDC800EFB9CC /* common.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 544129D221C2DDC800EFB9CC /* common.pb.cc */; };
38+
544129DB21C2DDC800EFB9CC /* firestore.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 544129D421C2DDC800EFB9CC /* firestore.pb.cc */; };
39+
544129DC21C2DDC800EFB9CC /* query.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 544129D621C2DDC800EFB9CC /* query.pb.cc */; };
40+
544129DD21C2DDC800EFB9CC /* document.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 544129D821C2DDC800EFB9CC /* document.pb.cc */; };
41+
544129DE21C2DDC800EFB9CC /* write.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 544129D921C2DDC800EFB9CC /* write.pb.cc */; };
3742
544A20EE20F6C10C004E52CD /* BasicCompileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE0761F61F2FE68D003233AF /* BasicCompileTests.swift */; };
3843
54511E8E209805F8005BD28F /* hashing_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 54511E8D209805F8005BD28F /* hashing_test.cc */; };
3944
5467FB01203E5717009C9584 /* FIRFirestoreTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5467FAFF203E56F8009C9584 /* FIRFirestoreTests.mm */; };
@@ -156,11 +161,6 @@
156161
618BBEA620B89AAC00B5BCE7 /* target.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE7D20B89AAC00B5BCE7 /* target.pb.cc */; };
157162
618BBEA720B89AAC00B5BCE7 /* maybe_document.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE7E20B89AAC00B5BCE7 /* maybe_document.pb.cc */; };
158163
618BBEA820B89AAC00B5BCE7 /* mutation.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE8220B89AAC00B5BCE7 /* mutation.pb.cc */; };
159-
618BBEA920B89AAC00B5BCE7 /* common.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE8820B89AAC00B5BCE7 /* common.pb.cc */; };
160-
618BBEAA20B89AAC00B5BCE7 /* firestore.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE8A20B89AAC00B5BCE7 /* firestore.pb.cc */; };
161-
618BBEAB20B89AAC00B5BCE7 /* query.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE8C20B89AAC00B5BCE7 /* query.pb.cc */; };
162-
618BBEAC20B89AAC00B5BCE7 /* document.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE8E20B89AAC00B5BCE7 /* document.pb.cc */; };
163-
618BBEAD20B89AAC00B5BCE7 /* write.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE8F20B89AAC00B5BCE7 /* write.pb.cc */; };
164164
618BBEAE20B89AAC00B5BCE7 /* latlng.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE9220B89AAC00B5BCE7 /* latlng.pb.cc */; };
165165
618BBEAF20B89AAC00B5BCE7 /* annotations.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE9520B89AAC00B5BCE7 /* annotations.pb.cc */; };
166166
618BBEB020B89AAC00B5BCE7 /* http.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE9720B89AAC00B5BCE7 /* http.pb.cc */; };
@@ -313,6 +313,16 @@
313313
403DBF6EFB541DFD01582AA3 /* path_test.cc */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; path = path_test.cc; sourceTree = "<group>"; };
314314
444B7AB3F5A2929070CB1363 /* hard_assert_test.cc */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; path = hard_assert_test.cc; sourceTree = "<group>"; };
315315
54131E9620ADE678001DF3FF /* string_format_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_format_test.cc; sourceTree = "<group>"; };
316+
544129D021C2DDC800EFB9CC /* query.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = query.pb.h; sourceTree = "<group>"; };
317+
544129D121C2DDC800EFB9CC /* common.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = common.pb.h; sourceTree = "<group>"; };
318+
544129D221C2DDC800EFB9CC /* common.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = common.pb.cc; sourceTree = "<group>"; };
319+
544129D321C2DDC800EFB9CC /* firestore.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = firestore.pb.h; sourceTree = "<group>"; };
320+
544129D421C2DDC800EFB9CC /* firestore.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = firestore.pb.cc; sourceTree = "<group>"; };
321+
544129D521C2DDC800EFB9CC /* write.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = write.pb.h; sourceTree = "<group>"; };
322+
544129D621C2DDC800EFB9CC /* query.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = query.pb.cc; sourceTree = "<group>"; };
323+
544129D721C2DDC800EFB9CC /* document.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = document.pb.h; sourceTree = "<group>"; };
324+
544129D821C2DDC800EFB9CC /* document.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = document.pb.cc; sourceTree = "<group>"; };
325+
544129D921C2DDC800EFB9CC /* write.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = write.pb.cc; sourceTree = "<group>"; };
316326
54511E8D209805F8005BD28F /* hashing_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hashing_test.cc; sourceTree = "<group>"; };
317327
5467FAFF203E56F8009C9584 /* FIRFirestoreTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FIRFirestoreTests.mm; sourceTree = "<group>"; };
318328
5467FB06203E6A44009C9584 /* app_testing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = app_testing.h; sourceTree = "<group>"; };
@@ -456,16 +466,6 @@
456466
618BBE8020B89AAC00B5BCE7 /* maybe_document.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maybe_document.pb.h; sourceTree = "<group>"; };
457467
618BBE8120B89AAC00B5BCE7 /* mutation.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mutation.pb.h; sourceTree = "<group>"; };
458468
618BBE8220B89AAC00B5BCE7 /* mutation.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mutation.pb.cc; sourceTree = "<group>"; };
459-
618BBE8620B89AAC00B5BCE7 /* query.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = query.pb.h; sourceTree = "<group>"; };
460-
618BBE8720B89AAC00B5BCE7 /* common.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = common.pb.h; sourceTree = "<group>"; };
461-
618BBE8820B89AAC00B5BCE7 /* common.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = common.pb.cc; sourceTree = "<group>"; };
462-
618BBE8920B89AAC00B5BCE7 /* firestore.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = firestore.pb.h; sourceTree = "<group>"; };
463-
618BBE8A20B89AAC00B5BCE7 /* firestore.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = firestore.pb.cc; sourceTree = "<group>"; };
464-
618BBE8B20B89AAC00B5BCE7 /* write.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = write.pb.h; sourceTree = "<group>"; };
465-
618BBE8C20B89AAC00B5BCE7 /* query.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = query.pb.cc; sourceTree = "<group>"; };
466-
618BBE8D20B89AAC00B5BCE7 /* document.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = document.pb.h; sourceTree = "<group>"; };
467-
618BBE8E20B89AAC00B5BCE7 /* document.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = document.pb.cc; sourceTree = "<group>"; };
468-
618BBE8F20B89AAC00B5BCE7 /* write.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = write.pb.cc; sourceTree = "<group>"; };
469469
618BBE9120B89AAC00B5BCE7 /* latlng.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = latlng.pb.h; sourceTree = "<group>"; };
470470
618BBE9220B89AAC00B5BCE7 /* latlng.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = latlng.pb.cc; sourceTree = "<group>"; };
471471
618BBE9420B89AAC00B5BCE7 /* http.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = http.pb.h; sourceTree = "<group>"; };
@@ -640,6 +640,23 @@
640640
path = App;
641641
sourceTree = "<group>";
642642
};
643+
544129CF21C2DDC800EFB9CC /* v1 */ = {
644+
isa = PBXGroup;
645+
children = (
646+
544129D221C2DDC800EFB9CC /* common.pb.cc */,
647+
544129D121C2DDC800EFB9CC /* common.pb.h */,
648+
544129D821C2DDC800EFB9CC /* document.pb.cc */,
649+
544129D721C2DDC800EFB9CC /* document.pb.h */,
650+
544129D421C2DDC800EFB9CC /* firestore.pb.cc */,
651+
544129D321C2DDC800EFB9CC /* firestore.pb.h */,
652+
544129D621C2DDC800EFB9CC /* query.pb.cc */,
653+
544129D021C2DDC800EFB9CC /* query.pb.h */,
654+
544129D921C2DDC800EFB9CC /* write.pb.cc */,
655+
544129D521C2DDC800EFB9CC /* write.pb.h */,
656+
);
657+
path = v1;
658+
sourceTree = "<group>";
659+
};
643660
544A20ED20F6C046004E52CD /* API */ = {
644661
isa = PBXGroup;
645662
children = (
@@ -940,28 +957,11 @@
940957
618BBE8420B89AAC00B5BCE7 /* firestore */ = {
941958
isa = PBXGroup;
942959
children = (
943-
618BBE8520B89AAC00B5BCE7 /* v1beta1 */,
960+
544129CF21C2DDC800EFB9CC /* v1 */,
944961
);
945962
path = firestore;
946963
sourceTree = "<group>";
947964
};
948-
618BBE8520B89AAC00B5BCE7 /* v1beta1 */ = {
949-
isa = PBXGroup;
950-
children = (
951-
618BBE8820B89AAC00B5BCE7 /* common.pb.cc */,
952-
618BBE8720B89AAC00B5BCE7 /* common.pb.h */,
953-
618BBE8E20B89AAC00B5BCE7 /* document.pb.cc */,
954-
618BBE8D20B89AAC00B5BCE7 /* document.pb.h */,
955-
618BBE8A20B89AAC00B5BCE7 /* firestore.pb.cc */,
956-
618BBE8920B89AAC00B5BCE7 /* firestore.pb.h */,
957-
618BBE8C20B89AAC00B5BCE7 /* query.pb.cc */,
958-
618BBE8620B89AAC00B5BCE7 /* query.pb.h */,
959-
618BBE8F20B89AAC00B5BCE7 /* write.pb.cc */,
960-
618BBE8B20B89AAC00B5BCE7 /* write.pb.h */,
961-
);
962-
path = v1beta1;
963-
sourceTree = "<group>";
964-
};
965965
618BBE9020B89AAC00B5BCE7 /* type */ = {
966966
isa = PBXGroup;
967967
children = (
@@ -1927,14 +1927,14 @@
19271927
B6FB467D208E9D3C00554BA2 /* async_queue_test.cc in Sources */,
19281928
54740A581FC914F000713A1A /* autoid_test.cc in Sources */,
19291929
AB380D02201BC69F00D97691 /* bits_test.cc in Sources */,
1930-
618BBEA920B89AAC00B5BCE7 /* common.pb.cc in Sources */,
1930+
544129DA21C2DDC800EFB9CC /* common.pb.cc in Sources */,
19311931
548DB929200D59F600E00ABC /* comparison_test.cc in Sources */,
19321932
B67BF449216EB43000CA9097 /* create_noop_connectivity_monitor.cc in Sources */,
19331933
ABC1D7DC2023A04B00BA84F0 /* credentials_provider_test.cc in Sources */,
19341934
ABE6637A201FA81900ED349A /* database_id_test.cc in Sources */,
19351935
AB38D93020236E21000A432D /* database_info_test.cc in Sources */,
19361936
546854AA20A36867004BDBD5 /* datastore_test.mm in Sources */,
1937-
618BBEAC20B89AAC00B5BCE7 /* document.pb.cc in Sources */,
1937+
544129DD21C2DDC800EFB9CC /* document.pb.cc in Sources */,
19381938
B6152AD7202A53CB000E5744 /* document_key_test.cc in Sources */,
19391939
AB6B908420322E4D00CC290A /* document_test.cc in Sources */,
19401940
ABC1D7DD2023A04F00BA84F0 /* empty_credentials_provider_test.cc in Sources */,
@@ -1949,7 +1949,7 @@
19491949
AB356EF7200EA5EB0089B766 /* field_value_test.cc in Sources */,
19501950
D94A1862B8FB778225DB54A1 /* filesystem_test.cc in Sources */,
19511951
ABC1D7E42024AFDE00BA84F0 /* firebase_credentials_provider_test.mm in Sources */,
1952-
618BBEAA20B89AAC00B5BCE7 /* firestore.pb.cc in Sources */,
1952+
544129DB21C2DDC800EFB9CC /* firestore.pb.cc in Sources */,
19531953
AB7BAB342012B519001E0872 /* geo_point_test.cc in Sources */,
19541954
B6D9649121544D4F00EB9CFB /* grpc_connection_test.cc in Sources */,
19551955
B6BBE43121262CF400C6A53E /* grpc_stream_test.cc in Sources */,
@@ -1973,7 +1973,7 @@
19731973
AB380D04201BC6E400D97691 /* ordered_code_test.cc in Sources */,
19741974
5A080105CCBFDB6BF3F3772D /* path_test.cc in Sources */,
19751975
549CCA5920A36E1F00BCEB75 /* precondition_test.cc in Sources */,
1976-
618BBEAB20B89AAC00B5BCE7 /* query.pb.cc in Sources */,
1976+
544129DC21C2DDC800EFB9CC /* query.pb.cc in Sources */,
19771977
6F3CAC76D918D6B0917EDF92 /* query_test.cc in Sources */,
19781978
B686F2B22025000D0028D6BE /* resource_path_test.cc in Sources */,
19791979
54740A571FC914BA00713A1A /* secure_random_test.cc in Sources */,
@@ -2000,7 +2000,7 @@
20002000
549CCA5120A36DBC00BCEB75 /* tree_sorted_map_test.cc in Sources */,
20012001
C80B10E79CDD7EF7843C321E /* type_traits_apple_test.mm in Sources */,
20022002
ABC1D7DE2023A05300BA84F0 /* user_test.cc in Sources */,
2003-
618BBEAD20B89AAC00B5BCE7 /* write.pb.cc in Sources */,
2003+
544129DE21C2DDC800EFB9CC /* write.pb.cc in Sources */,
20042004
);
20052005
runOnlyForDeploymentPostprocessing = 0;
20062006
};

‎Firestore/Example/FuzzTests/FuzzingResources/Serializer/Corpus/ConvertTextToBinary.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ for text_proto_file in "${text_protos_dir}"/*; do
5353
echo "${file_content}" \
5454
| "${SRCROOT}/Pods/!ProtoCompiler/protoc" \
5555
-I"${SRCROOT}/../../Firestore/Protos/protos" \
56-
--encode=google.firestore.v1beta1."${message_type}" \
57-
google/firestore/v1beta1/document.proto > "${binary_protos_dir}/${file_name}"
56+
--encode=google.firestore.v1."${message_type}" \
57+
google/firestore/v1/document.proto > "${binary_protos_dir}/${file_name}"
5858
done

‎Firestore/Example/Tests/Local/FSTLocalSerializerTests.mm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
#import "Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.h"
2323
#import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h"
2424
#import "Firestore/Protos/objc/firestore/local/Target.pbobjc.h"
25-
#import "Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.h"
26-
#import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h"
27-
#import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h"
28-
#import "Firestore/Protos/objc/google/firestore/v1beta1/Query.pbobjc.h"
29-
#import "Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.h"
25+
#import "Firestore/Protos/objc/google/firestore/v1/Common.pbobjc.h"
26+
#import "Firestore/Protos/objc/google/firestore/v1/Document.pbobjc.h"
27+
#import "Firestore/Protos/objc/google/firestore/v1/Firestore.pbobjc.h"
28+
#import "Firestore/Protos/objc/google/firestore/v1/Query.pbobjc.h"
29+
#import "Firestore/Protos/objc/google/firestore/v1/Write.pbobjc.h"
3030
#import "Firestore/Protos/objc/google/type/Latlng.pbobjc.h"
3131
#import "Firestore/Source/Core/FSTQuery.h"
3232
#import "Firestore/Source/Local/FSTQueryData.h"

‎Firestore/Example/Tests/Model/FSTFieldValueTests.mm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ - (void)testWrapsBooleans {
134134
};
135135

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

141141
// We use a canonical NaN bit pattern that's common for both Java and Objective-C. Specifically:
142142
// - sign: 0

‎Firestore/Example/Tests/Remote/FSTSerializerBetaTests.mm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727

2828
#import "Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.h"
2929
#import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h"
30-
#import "Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.h"
31-
#import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h"
32-
#import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h"
33-
#import "Firestore/Protos/objc/google/firestore/v1beta1/Query.pbobjc.h"
34-
#import "Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.h"
30+
#import "Firestore/Protos/objc/google/firestore/v1/Common.pbobjc.h"
31+
#import "Firestore/Protos/objc/google/firestore/v1/Document.pbobjc.h"
32+
#import "Firestore/Protos/objc/google/firestore/v1/Firestore.pbobjc.h"
33+
#import "Firestore/Protos/objc/google/firestore/v1/Query.pbobjc.h"
34+
#import "Firestore/Protos/objc/google/firestore/v1/Write.pbobjc.h"
3535
#import "Firestore/Protos/objc/google/rpc/Status.pbobjc.h"
3636
#import "Firestore/Protos/objc/google/type/Latlng.pbobjc.h"
3737
#import "Firestore/Source/API/FIRFieldValue+Internal.h"

‎Firestore/Protos/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ set(
2525
firestore/local/target
2626
google/api/annotations
2727
google/api/http
28-
google/firestore/v1beta1/common
29-
google/firestore/v1beta1/document
30-
google/firestore/v1beta1/firestore
31-
google/firestore/v1beta1/query
32-
google/firestore/v1beta1/write
28+
google/firestore/v1/common
29+
google/firestore/v1/document
30+
google/firestore/v1/firestore
31+
google/firestore/v1/query
32+
google/firestore/v1/write
3333
google/rpc/status
3434
google/type/latlng
3535
)
@@ -113,8 +113,8 @@ endfunction()
113113
# omitted here.
114114
set(
115115
PROTOBUF_OBJC_GENERATED_SOURCES
116-
${OUTPUT_DIR}/objc/google/firestore/v1beta1/Firestore.pbrpc.h
117-
${OUTPUT_DIR}/objc/google/firestore/v1beta1/Firestore.pbrpc.m
116+
${OUTPUT_DIR}/objc/google/firestore/v1/Firestore.pbrpc.h
117+
${OUTPUT_DIR}/objc/google/firestore/v1/Firestore.pbrpc.m
118118
)
119119
foreach(root ${PROTO_FILE_ROOTS})
120120
get_filename_component(dir ${root} DIRECTORY)

0 commit comments

Comments
 (0)