Skip to content

Fix firestore ios build #157

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 3 commits into from
Oct 10, 2020
Merged

Fix firestore ios build #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5d2ae3
fix firebase build
sunmou99 Oct 7, 2020
475da5f
Merge branch 'dev' into feature/fix-firestore-ios-build
sunmou99 Oct 9, 2020
c40eb7e
Merge branch 'dev' into feature/fix-firestore-ios-build
sunmou99 Oct 9, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions firestore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ endif()
set(common_SRCS
src/common/cleanup.h
src/common/collection_reference.cc
src/common/compiler_info.cc
src/common/compiler_info.h
src/common/document_change.cc
src/common/document_reference.cc
src/common/document_snapshot.cc
Expand Down
4 changes: 2 additions & 2 deletions firestore/integration_test/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ platform :ios, '8.0'
# Firebase Realtime Firestore test application.

target 'integration_test' do
pod 'Firebase/Firestore', '6.24.0'
pod 'Firebase/Auth', '6.24.0'
pod 'Firebase/Firestore', '6.32.2'
pod 'Firebase/Auth', '6.32.2'
end

post_install do |installer|
Expand Down
6 changes: 4 additions & 2 deletions firestore/integration_test/src/integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,10 @@ TEST_F(FirebaseFirestoreBasicTest, TestDocumentListener) {
firebase::firestore::ListenerRegistration registration =
document.AddSnapshotListener(
[&](const firebase::firestore::DocumentSnapshot& result,
firebase::firestore::Error error) {
EXPECT_EQ(error, firebase::firestore::kErrorOk);
firebase::firestore::Error error_code,
const std::string& error_message) {
EXPECT_EQ(error_code, firebase::firestore::kErrorOk);
EXPECT_EQ(error_message, "");
document_snapshots.push_back(result.GetData());
});

Expand Down