Skip to content

Commit 019aa23

Browse files
var-consta-maurice
var-const
authored and
a-maurice
committed
Import Firestore release 1.13.0 from GitHub (Firebase 6.24.0, M70).
The only manual changes are: - update file references in build files to accommodate for the file path shortening; - similarly change all the relevant includes; - revert the google3-internal change to `exception.cc` being overwritten (see cr/295257418). Copybara-generated description follows: Import of Firestore from GitHub. - 88f49a8bf609b60b46472f9766ddf8fd7c8d843b Fix Firestore build broken by M70 version changes (#5498) by Paul Beusterien <[email protected]> - 2656033eb21df191c9097b70b78a8cb7cdcd620c Update integration testing docs (#5490) by Gil <[email protected]> - 7c3744b417e27c9cf07c2627ba8d19bb44b2ad9a Update CHANGELOG for Firestore v1.13.0 (#5491) by Gil <[email protected]> - 68513286e31e10da7bb098d77da332c3e9197db5 Update nanopb to 0.3.9.5 (CocoaPods 1.30905.0) (#4264) by Paul Beusterien <[email protected]> - 3d573f97148550e86f6c278c7ff9a30cdf861aa3 Update Firestore sources for nanopb 0.3.9.5 (#5481) by Paul Beusterien <[email protected]> - e3f3a78aefaafdab4fcfb41d24ccc93b7a5279e9 Remove the Firestore_SwiftTests_iOS target (#5458) by Gil <[email protected]> - b1685197dbfbfaf8bb3b23ba085a839688f68147 Fix GoogleTest failure mechanism on CI (#5444) by Gil <[email protected]> - 1df5574c4fa897fe821769e9b6b7e4066c57369a Upgrade gRPC-C++ to 1.28.0 (#4312) by Gil <[email protected]> - b12835caee248128461a84acaf28df9224914a29 Manually specify the authorization header (#5420) by Gil <[email protected]> - 7a58eba2e5041aaa91f366277bf0f7ce3870876a Remove `firebase/firestore` from paths in Firestore/core ... by Gil <[email protected]> - 74f4ceb4c9d765780e87dea6cb03a052f3d5adc7 Fix unused variable warnings (#5389) by Gil <[email protected]> - 96de8fb74b7ed91aba21efffc008045ff4ce468a Add LLDB type summaries for Firestore types (#5407) by Gil <[email protected]> - 26430a9086b3c6fdcd711f301d3e147ca8f91c6c Check for error code matches in Transaction tests (#5391) by Brian Chen <[email protected]> - 0a352472a86ff7aa4af0e8ecc494e9aa7d3eda2c Fix flaky transaction tests (#5334) by Brian Chen <[email protected]> - c873af80385d9ca63fc73cd8b08ba8a4b9a0bb97 Shorten CMake test targets/begin firebase_core consolidat... by Gil <[email protected]> - e2c200224aed8349eebc2192e2c074285b5a5274 Update CHANGELOG for Firestore v1.12.1 (#5373) by Gil <[email protected]> - cd6d0f1c1d3b475ed2ba6ea07bfaa74e4b2a684e Implement limbo resolution listen throttling (#5310) by Denver Coneybeare <[email protected]> - c056540052a6b96540e387b90bbbb856968789a7 Replace a hard assert with a call to UpdateTrackedLimboDo... by wu-hui <[email protected]> - 77f92cd2c677907139281bbd58a673e1fb0ec1bb Stop using built-in CMake Framework support (#5316) by Gil <[email protected]> - b90ddf1339c8ec4b2004faf416f100beb59d0ccc Limit Swift line lengths to 100 (#5315) by Paul Beusterien <[email protected]> - b05e9eb68dce3ec7bdef4d75667b58091375bb1e Update spec tests from changes in the firebase-js-sdk res... by Denver Coneybeare <[email protected]> - af7898c01e07d04d20dba8186440e0afdf65cd69 Merge remote_test_util and remote_testing libraries (#5254) by Gil <[email protected]> - 4f01818bb30964bb0ba25f5da42e73e0eee88955 Update Firestore changelog for M68 (#5281) by Morgan Chen <[email protected]> - b04d3a739dae3f5ec3a93a780a59d0e6b688e288 Only check for active targets in GetTargetIds (#5275) by Brian Chen <[email protected]> - 4ea4340285fe2c72d87115c319f3a681853ae2ad Upgrade clang-format (#5265) by Paul Beusterien <[email protected]> - 69f9a45de6ba918792a536b487b00a3b65f6c913 Update swiftformat to 0.44.6 (#5263) by Paul Beusterien <[email protected]> PiperOrigin-RevId: 311432082
1 parent 097e608 commit 019aa23

34 files changed

+87
-87
lines changed

‎firestore/src/android/field_path_android.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#if defined(__ANDROID__)
77
#include "firestore/src/android/field_path_portable.h"
88
#else // defined(__ANDROID__)
9-
#include "Firestore/core/src/firebase/firestore/model/field_path.h"
9+
#include "Firestore/core/src/model/field_path.h"
1010
#endif // defined(__ANDROID__)
1111

1212
namespace firebase {

‎firestore/src/common/field_path.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
#if defined(__ANDROID__) || defined(FIRESTORE_STUB_BUILD)
2828
#include "firestore/src/android/field_path_portable.h"
2929
#else
30-
#include "Firestore/core/src/firebase/firestore/model/field_path.h"
31-
#include "Firestore/core/src/firebase/firestore/util/hashing.h"
30+
#include "Firestore/core/src/model/field_path.h"
31+
#include "Firestore/core/src/util/hashing.h"
3232
#endif // defined(__ANDROID__) || defined(FIRESTORE_STUB_BUILD)
3333

3434
namespace firebase {

‎firestore/src/common/settings.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "app/meta/move.h"
66

77
#if !defined(__ANDROID__) && !defined(FIRESTORE_STUB_BUILD)
8-
#include "Firestore/core/src/firebase/firestore/util/executor.h"
8+
#include "Firestore/core/src/util/executor.h"
99
#endif
1010

1111
namespace firebase {

‎firestore/src/common/settings_ios.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <dispatch/dispatch.h>
44

55
#include "absl/memory/memory.h"
6-
#include "Firestore/core/src/firebase/firestore/util/executor_libdispatch.h"
6+
#include "Firestore/core/src/util/executor_libdispatch.h"
77

88
namespace firebase {
99
namespace firestore {

‎firestore/src/ios/collection_reference_ios.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "firestore/src/ios/document_reference_ios.h"
88
#include "firestore/src/ios/field_value_ios.h"
99
#include "firestore/src/ios/user_data_converter_ios.h"
10-
#include "Firestore/core/src/firebase/firestore/core/user_data.h"
10+
#include "Firestore/core/src/core/user_data.h"
1111

1212
namespace firebase {
1313
namespace firestore {

‎firestore/src/ios/collection_reference_ios.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "firestore/src/include/firebase/firestore/document_reference.h"
77
#include "firestore/src/ios/promise_factory_ios.h"
88
#include "firestore/src/ios/query_ios.h"
9-
#include "Firestore/core/src/firebase/firestore/api/collection_reference.h"
9+
#include "Firestore/core/src/api/collection_reference.h"
1010

1111
namespace firebase {
1212
namespace firestore {

‎firestore/src/ios/converter_ios.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
#include "firestore/src/ios/transaction_ios.h"
1717
#include "firestore/src/ios/write_batch_ios.h"
1818
#include "absl/memory/memory.h"
19-
#include "Firestore/core/src/firebase/firestore/api/collection_reference.h"
20-
#include "Firestore/core/src/firebase/firestore/api/document_change.h"
21-
#include "Firestore/core/src/firebase/firestore/api/document_reference.h"
22-
#include "Firestore/core/src/firebase/firestore/api/document_snapshot.h"
23-
#include "Firestore/core/src/firebase/firestore/api/listener_registration.h"
24-
#include "Firestore/core/src/firebase/firestore/api/query_core.h"
25-
#include "Firestore/core/src/firebase/firestore/api/query_snapshot.h"
26-
#include "Firestore/core/src/firebase/firestore/core/transaction.h"
27-
#include "Firestore/core/src/firebase/firestore/model/field_path.h"
19+
#include "Firestore/core/src/api/collection_reference.h"
20+
#include "Firestore/core/src/api/document_change.h"
21+
#include "Firestore/core/src/api/document_reference.h"
22+
#include "Firestore/core/src/api/document_snapshot.h"
23+
#include "Firestore/core/src/api/listener_registration.h"
24+
#include "Firestore/core/src/api/query_core.h"
25+
#include "Firestore/core/src/api/query_snapshot.h"
26+
#include "Firestore/core/src/core/transaction.h"
27+
#include "Firestore/core/src/model/field_path.h"
2828

2929
namespace firebase {
3030
namespace firestore {

‎firestore/src/ios/credentials_provider_ios.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "firestore/src/ios/hard_assert_ios.h"
66
#include "firebase/firestore/firestore_errors.h"
7-
#include "Firestore/core/src/firebase/firestore/util/status.h"
7+
#include "Firestore/core/src/util/status.h"
88

99
namespace firebase {
1010
namespace firestore {

‎firestore/src/ios/credentials_provider_ios.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
#include "app/src/include/firebase/future.h"
99
#include "auth/src/include/firebase/auth.h"
10-
#include "Firestore/core/src/firebase/firestore/auth/credentials_provider.h"
11-
#include "Firestore/core/src/firebase/firestore/auth/token.h"
12-
#include "Firestore/core/src/firebase/firestore/auth/user.h"
13-
#include "Firestore/core/src/firebase/firestore/util/statusor.h"
10+
#include "Firestore/core/src/auth/credentials_provider.h"
11+
#include "Firestore/core/src/auth/token.h"
12+
#include "Firestore/core/src/auth/user.h"
13+
#include "Firestore/core/src/util/statusor.h"
1414

1515
namespace firebase {
1616
namespace firestore {

‎firestore/src/ios/document_change_ios.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include "firestore/src/include/firebase/firestore/document_change.h"
77
#include "firestore/src/ios/firestore_ios.h"
8-
#include "Firestore/core/src/firebase/firestore/api/document_change.h"
8+
#include "Firestore/core/src/api/document_change.h"
99

1010
namespace firebase {
1111
namespace firestore {

0 commit comments

Comments
 (0)