Skip to content

Commit e609654

Browse files
a-mauricea-maurice
committed
Merge remote-tracking branch 'origin/master' into ghm
2 parents fb49fd5 + b22d521 commit e609654

Some content is hidden

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

50 files changed

+125
-109
lines changed

‎README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,14 @@ Currently, the third party libraries that can be provided this way are:
190190

191191
#### Building with CMake for iOS
192192
The Firebase C++ SDK comes with a CMake config file to build the library for
193-
iOS platforms, [cmake/ios.cmake](/cmake/ios.cmake). In order to build with it,
194-
when running the CMake configuration pass it in with the CMAKE_TOOLCHAIN_FILE
195-
definition. For example, to build the Analytics library for iOS, you could run
196-
the following commands:
193+
iOS platforms, [cmake/toolchains/ios.cmake](/cmake/toolchains/ios.cmake). In
194+
order to build with it, when running the CMake configuration pass it in with
195+
the CMAKE_TOOLCHAIN_FILE definition. For example, to build the Analytics
196+
library for iOS, you could run the following commands:
197197

198198
``` bash
199199
mkdir ios_build && cd ios_build
200-
cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/ios.cmake ..
200+
cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchains/ios.cmake ..
201201
cmake --build . --target firebase_analytics
202202
```
203203

‎app/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,11 @@ else()
191191
systems via: \
192192
apt-get install libsecret-1-dev")
193193
endif()
194+
# If building for 32 bit, the include directories might need to be fixed.
195+
if("${CMAKE_CXX_FLAGS}" MATCHES "-m32")
196+
string(REGEX REPLACE "x86_64" "i386"
197+
LIBSECRET_INCLUDE_DIRS "${LIBSECRET_INCLUDE_DIRS}")
198+
endif()
194199
set(app_desktop_extra_SRCS
195200
src/secure/user_secure_linux_internal.cc
196201
src/locale.cc

‎cmake/cpp_pack.cmake

+7-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,13 @@ if(${FIREBASE_CPP_BUILD_PACKAGE})
4646
elseif(APPLE)
4747
set(FIREBASE_LIB_CONFIG_PATH "darwin")
4848
else()
49-
set(FIREBASE_LIB_CONFIG_PATH "linux")
49+
# Check if building for 32 bit
50+
message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
51+
if("${CMAKE_CXX_FLAGS}" MATCHES "-m32")
52+
set(FIREBASE_LIB_CONFIG_PATH "linux/i386")
53+
else()
54+
set(FIREBASE_LIB_CONFIG_PATH "linux/x86_64")
55+
endif()
5056
endif()
5157
endif()
5258

‎cmake/ios.cmake renamed to ‎cmake/toolchains/ios.cmake

File renamed without changes.

‎cmake/ios_simulator.cmake renamed to ‎cmake/toolchains/ios_simulator.cmake

File renamed without changes.

‎cmake/toolchains/linux_32.cmake

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Toolchain file for building 32-bit Linux libraries
2+
3+
set(CMAKE_C_FLAGS -m32)
4+
set(CMAKE_CXX_FLAGS -m32)
5+
set(CMAKE_LIBRARY_PATH "/usr/lib/i386-linux-gnu")

‎firestore/src/android/event_listener_android.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "firestore/src/android/query_snapshot_android.h"
1212
#include "firestore/src/android/util_android.h"
1313
#include "firestore/src/include/firebase/firestore/query_snapshot.h"
14-
#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/firestore_errors.h"
14+
#include "Firestore/core/include/firebase/firestore/firestore_errors.h"
1515

1616
namespace firebase {
1717
namespace firestore {

‎firestore/src/android/field_path_android.cc

+1-1
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 "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/field_path.h"
9+
#include "Firestore/core/src/firebase/firestore/model/field_path.h"
1010
#endif // defined(__ANDROID__)
1111

1212
namespace firebase {

‎firestore/src/android/field_value_android.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include "firestore/src/android/wrapper.h"
1010
#include "firestore/src/include/firebase/firestore/document_reference.h"
1111
#include "firestore/src/include/firebase/firestore/field_value.h"
12-
#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/geo_point.h"
13-
#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/timestamp.h"
12+
#include "Firestore/core/include/firebase/firestore/geo_point.h"
13+
#include "Firestore/core/include/firebase/firestore/timestamp.h"
1414

1515
namespace firebase {
1616
namespace firestore {

‎firestore/src/android/firebase_firestore_exception_android.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include "app/src/include/firebase/app.h"
77
#include "app/src/util_android.h"
8-
#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/firestore_errors.h"
8+
#include "Firestore/core/include/firebase/firestore/firestore_errors.h"
99

1010
namespace firebase {
1111
namespace firestore {

‎firestore/src/android/firestore_android_test_main.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
// non-google3 code should include "gtest/gtest.h" instead.
4141
#include "testing/base/public/gunit.h"
4242
// For GTEST_FLAG(filter).
43-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/hard_assert.h"
43+
#include "Firestore/core/src/firebase/firestore/util/hard_assert.h"
4444
#include "third_party/googletest/googletest/src/gtest-internal-inl.h"
4545

4646
#ifndef NATIVE_FUNCTION_NAME

‎firestore/src/android/geo_point_android.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <jni.h>
55

66
#include "app/src/include/firebase/app.h"
7-
#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/geo_point.h"
7+
#include "Firestore/core/include/firebase/firestore/geo_point.h"
88

99
namespace firebase {
1010
namespace firestore {

‎firestore/src/android/geo_point_portable.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <sstream>
2828

2929
#include "app/src/assert.h"
30-
#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/geo_point.h"
30+
#include "Firestore/core/include/firebase/firestore/geo_point.h"
3131

3232
namespace firebase {
3333
namespace firestore {

‎firestore/src/android/lambda_event_listener.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "app/meta/move.h"
55
#include "firestore/src/include/firebase/firestore/event_listener.h"
6-
#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/firestore_errors.h"
6+
#include "Firestore/core/include/firebase/firestore/firestore_errors.h"
77

88
#if defined(FIREBASE_USE_STD_FUNCTION) || defined(DOXYGEN)
99
#include <functional>

‎firestore/src/android/timestamp_android.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <jni.h>
55

66
#include "app/src/include/firebase/app.h"
7-
#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/timestamp.h"
7+
#include "Firestore/core/include/firebase/firestore/timestamp.h"
88

99
namespace firebase {
1010
namespace firestore {

‎firestore/src/android/timestamp_portable.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <ostream>
2626
#include <sstream>
2727

28-
#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/timestamp.h"
28+
#include "Firestore/core/include/firebase/firestore/timestamp.h"
2929

3030
#if defined(__APPLE__)
3131
#import <CoreFoundation/CoreFoundation.h>

‎firestore/src/common/field_path.cc

+2-2
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 "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/field_path.h"
31-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/hashing.h"
30+
#include "Firestore/core/src/firebase/firestore/model/field_path.h"
31+
#include "Firestore/core/src/firebase/firestore/util/hashing.h"
3232
#endif // defined(__ANDROID__) || defined(FIRESTORE_STUB_BUILD)
3333

3434
namespace firebase {

‎firestore/src/common/settings.cc

+1-1
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 "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/executor.h"
8+
#include "Firestore/core/src/firebase/firestore/util/executor.h"
99
#endif
1010

1111
namespace firebase {

‎firestore/src/common/settings_ios.mm

+1-1
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 "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/executor_libdispatch.h"
6+
#include "Firestore/core/src/firebase/firestore/util/executor_libdispatch.h"
77

88
namespace firebase {
99
namespace firestore {

‎firestore/src/ios/collection_reference_ios.cc

+1-1
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 "firebase-ios-sdk/Firestore/core/src/firebase/firestore/core/user_data.h"
10+
#include "Firestore/core/src/firebase/firestore/core/user_data.h"
1111

1212
namespace firebase {
1313
namespace firestore {

‎firestore/src/ios/collection_reference_ios.h

+1-1
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 "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/collection_reference.h"
9+
#include "Firestore/core/src/firebase/firestore/api/collection_reference.h"
1010

1111
namespace firebase {
1212
namespace firestore {

‎firestore/src/ios/converter_ios.h

+9-9
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 "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/collection_reference.h"
20-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/document_change.h"
21-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/document_reference.h"
22-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/document_snapshot.h"
23-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/listener_registration.h"
24-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/query_core.h"
25-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/query_snapshot.h"
26-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/core/transaction.h"
27-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/field_path.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"
2828

2929
namespace firebase {
3030
namespace firestore {

‎firestore/src/ios/credentials_provider_ios.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#include <utility>
44

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

99
namespace firebase {
1010
namespace firestore {

‎firestore/src/ios/credentials_provider_ios.h

+4-4
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 "firebase-ios-sdk/Firestore/core/src/firebase/firestore/auth/credentials_provider.h"
11-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/auth/token.h"
12-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/auth/user.h"
13-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/statusor.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"
1414

1515
namespace firebase {
1616
namespace firestore {

‎firestore/src/ios/document_change_ios.h

+1-1
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 "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/document_change.h"
8+
#include "Firestore/core/src/firebase/firestore/api/document_change.h"
99

1010
namespace firebase {
1111
namespace firestore {

‎firestore/src/ios/document_reference_ios.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
#include "firestore/src/ios/set_options_ios.h"
88
#include "firestore/src/ios/source_ios.h"
99
#include "firestore/src/ios/util_ios.h"
10-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/listener_registration.h"
11-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/core/listen_options.h"
12-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/core/user_data.h"
10+
#include "Firestore/core/src/firebase/firestore/api/listener_registration.h"
11+
#include "Firestore/core/src/firebase/firestore/core/listen_options.h"
12+
#include "Firestore/core/src/firebase/firestore/core/user_data.h"
1313

1414
namespace firebase {
1515
namespace firestore {

‎firestore/src/ios/document_reference_ios.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "firestore/src/ios/firestore_ios.h"
1212
#include "firestore/src/ios/promise_factory_ios.h"
1313
#include "firestore/src/ios/user_data_converter_ios.h"
14-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/document_reference.h"
14+
#include "Firestore/core/src/firebase/firestore/api/document_reference.h"
1515

1616
namespace firebase {
1717
namespace firestore {

‎firestore/src/ios/document_snapshot_ios.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#include "firestore/src/ios/converter_ios.h"
77
#include "firestore/src/ios/util_ios.h"
88
#include "absl/memory/memory.h"
9-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/document_reference.h"
10-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/database_id.h"
11-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/document_key.h"
12-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/field_path.h"
13-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/field_value_options.h"
9+
#include "Firestore/core/src/firebase/firestore/api/document_reference.h"
10+
#include "Firestore/core/src/firebase/firestore/model/database_id.h"
11+
#include "Firestore/core/src/firebase/firestore/model/document_key.h"
12+
#include "Firestore/core/src/firebase/firestore/model/field_path.h"
13+
#include "Firestore/core/src/firebase/firestore/model/field_value_options.h"
1414

1515
namespace firebase {
1616
namespace firestore {

‎firestore/src/ios/document_snapshot_ios.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include "firestore/src/include/firebase/firestore/map_field_value.h"
1212
#include "firestore/src/include/firebase/firestore/snapshot_metadata.h"
1313
#include "firestore/src/ios/firestore_ios.h"
14-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/document_snapshot.h"
15-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/field_value.h"
14+
#include "Firestore/core/src/firebase/firestore/api/document_snapshot.h"
15+
#include "Firestore/core/src/firebase/firestore/model/field_value.h"
1616

1717
namespace firebase {
1818
namespace firestore {

‎firestore/src/ios/field_value_ios.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
#include "firestore/src/include/firebase/firestore/field_value.h"
1111
#include "firestore/src/ios/firestore_ios.h"
1212
#include "absl/types/variant.h"
13-
#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/geo_point.h"
14-
#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/timestamp.h"
15-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/field_value.h"
13+
#include "Firestore/core/include/firebase/firestore/geo_point.h"
14+
#include "Firestore/core/include/firebase/firestore/timestamp.h"
15+
#include "Firestore/core/src/firebase/firestore/model/field_value.h"
1616

1717
namespace firebase {
1818
namespace firestore {

‎firestore/src/ios/firebase_firestore_settings_ios.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define FIREBASE_FIRESTORE_CLIENT_CPP_SRC_IOS_FIREBASE_FIRESTORE_SETTINGS_IOS_H_
33

44
#include "firestore/src/include/firebase/firestore/settings.h"
5-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/settings.h"
5+
#include "Firestore/core/src/firebase/firestore/api/settings.h"
66

77
namespace firebase {
88
namespace firestore {

‎firestore/src/ios/firestore_ios.cc

+8-8
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
#include "firestore/src/ios/listener_ios.h"
1414
#include "absl/memory/memory.h"
1515
#include "absl/types/any.h"
16-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/document_reference.h"
17-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/query_core.h"
18-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/database_id.h"
19-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/resource_path.h"
20-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/async_queue.h"
21-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/executor.h"
22-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/log.h"
23-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/status.h"
16+
#include "Firestore/core/src/firebase/firestore/api/document_reference.h"
17+
#include "Firestore/core/src/firebase/firestore/api/query_core.h"
18+
#include "Firestore/core/src/firebase/firestore/model/database_id.h"
19+
#include "Firestore/core/src/firebase/firestore/model/resource_path.h"
20+
#include "Firestore/core/src/firebase/firestore/util/async_queue.h"
21+
#include "Firestore/core/src/firebase/firestore/util/executor.h"
22+
#include "Firestore/core/src/firebase/firestore/util/log.h"
23+
#include "Firestore/core/src/firebase/firestore/util/status.h"
2424

2525
namespace firebase {
2626
namespace firestore {

‎firestore/src/ios/firestore_ios.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
#include "firestore/src/include/firebase/firestore/document_reference.h"
1515
#include "firestore/src/include/firebase/firestore/settings.h"
1616
#include "firestore/src/ios/promise_factory_ios.h"
17-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/firestore.h"
18-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/auth/credentials_provider.h"
19-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/model/database_id.h"
17+
#include "Firestore/core/src/firebase/firestore/api/firestore.h"
18+
#include "Firestore/core/src/firebase/firestore/auth/credentials_provider.h"
19+
#include "Firestore/core/src/firebase/firestore/model/database_id.h"
2020

2121
namespace firebase {
2222
namespace firestore {

‎firestore/src/ios/hard_assert_ios.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <utility>
2222

2323
#include "absl/base/optimization.h"
24-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/exception.h"
24+
#include "Firestore/core/src/firebase/firestore/util/exception.h"
2525

2626
// TODO(b/147444199): delete this file and use the one that comes from the
2727
// GitHub repo. This file provides simplified versions of `HARD_ASSERT` and

‎firestore/src/ios/listener_ios.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
#include "firestore/src/ios/converter_ios.h"
99
#include "firestore/src/ios/promise_ios.h"
10-
#include "firebase-ios-sdk/Firestore/core/include/firebase/firestore/firestore_errors.h"
11-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/core/event_listener.h"
12-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/util/statusor.h"
10+
#include "Firestore/core/include/firebase/firestore/firestore_errors.h"
11+
#include "Firestore/core/src/firebase/firestore/core/event_listener.h"
12+
#include "Firestore/core/src/firebase/firestore/util/statusor.h"
1313

1414
namespace firebase {
1515
namespace firestore {

‎firestore/src/ios/listener_registration_ios.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <memory>
55

66
#include "firestore/src/ios/firestore_ios.h"
7-
#include "firebase-ios-sdk/Firestore/core/src/firebase/firestore/api/listener_registration.h"
7+
#include "Firestore/core/src/firebase/firestore/api/listener_registration.h"
88

99
namespace firebase {
1010
namespace firestore {

0 commit comments

Comments
 (0)