Skip to content
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

Jump to bottom

Fix SPM compilation errors #7360

Merged
merged 1 commit into from
Feb 21, 2024
Merged

Fix SPM compilation errors #7360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions evergreen/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,7 @@ tasks:

- name: swift-build-and-test
exec_timeout_secs: 1800
tags: [ "for_pull_requests" ]
commands:
- func: "fetch source"
- func: "fetch binaries"
Expand Down
12 changes: 6 additions & 6 deletions test/object-store/c_api/c_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
//
////////////////////////////////////////////////////////////////////////////

#include "util/test_file.hpp"
#include "util/event_loop.hpp"
#include "../util/test_file.hpp"
#include "../util/event_loop.hpp"

#include <realm.h>

Expand All @@ -39,10 +39,10 @@
#include <fstream>

#if REALM_ENABLE_SYNC
#include "util/sync/flx_sync_harness.hpp"
#include "util/sync/sync_test_utils.hpp"
#include "util/test_path.hpp"
#include "util/unit_test_transport.hpp"
#include <util/sync/flx_sync_harness.hpp>
#include <util/sync/sync_test_utils.hpp>
Comment on lines +42 to +43
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: Am I correct in noticing there's a bit of inconsistency between using the "..." and <...> between these two files. What is the preferred method?

#include "../util/test_path.hpp"
#include "../util/unit_test_transport.hpp"

#include <realm/object-store/sync/app_utils.hpp>
#include <realm/object-store/sync/sync_user.hpp>
Expand Down
10 changes: 5 additions & 5 deletions test/object-store/realm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
//
////////////////////////////////////////////////////////////////////////////

#include <util/event_loop.hpp>
#include <util/test_file.hpp>
#include <util/test_utils.hpp>
#include <../util/semaphore.hpp>
#include "util/event_loop.hpp"
#include "util/test_file.hpp"
#include "util/test_utils.hpp"
#include "../util/semaphore.hpp"

#include <realm/db.hpp>
#include <realm/history.hpp>
Expand Down Expand Up @@ -48,7 +48,7 @@

#include <realm/object-store/sync/async_open_task.hpp>
#include <realm/object-store/sync/impl/sync_metadata.hpp>

#include <realm/object-store/sync/sync_session.hpp>
#include <realm/sync/noinst/client_history_impl.hpp>
#include <realm/sync/subscriptions.hpp>
#endif
Expand Down
Loading