Skip to content

RCORE-2080: Use the correct target conditional #7579

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.

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 1 commit into from
Apr 11, 2024

Conversation

nielsenko
Copy link
Contributor

@nielsenko nielsenko commented Apr 11, 2024

What, How & Why?

Current master does not compile for iOS.

Fixed by changing a target conditional in keychain_helper.cpp. TARGET_OS_OSX means only mac, where as TARGET_OS_MAC includes iPhone, tvOS, etc. (see TargetConditionals.h). Apple works in mysterious ways.

Fixes: #7580

☑️ ToDos

📝 Changelog update
🚦 Tests (or not relevant)
C-API, if public C++ API changed
bindgen/spec.yml, if public C++ API changed

@cla-bot cla-bot bot added the cla: yes label Apr 11, 2024
@nielsenko nielsenko marked this pull request as ready for review April 11, 2024 10:03
Copy link

Pull Request Test Coverage Report for Build github_pull_request_292823

Details

  • 0 of 1 (0.0%) changed or added relevant line in 1 file are covered.
  • 67 unchanged lines in 17 files lost coverage.
  • Overall coverage increased (+0.03%) to 91.821%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/realm/object-store/impl/apple/keychain_helper.cpp 0 1 0.0%
Files with Coverage Reduction New Missed Lines %
src/realm/array_key.cpp 1 98.61%
src/realm/sync/noinst/server/server.cpp 1 76.5%
test/test_dictionary.cpp 1 99.85%
test/test_index_string.cpp 1 94.63%
src/realm/cluster.cpp 2 77.52%
src/realm/object-store/shared_realm.cpp 2 93.01%
src/realm/query_expression.hpp 2 93.68%
src/realm/util/file.cpp 2 81.15%
src/realm/sync/network/network.cpp 3 89.52%
src/realm/sync/noinst/protocol_codec.hpp 3 76.08%
Totals Coverage Status
Change from base Build 2213: 0.03%
Covered Lines: 242956
Relevant Lines: 264596

💛 - Coveralls

@danieltabacaru
Copy link
Collaborator

The test failing is being fixed in #7542.

@nielsenko nielsenko changed the title Use the correct target conditional RCORE-2080: Use the correct target conditional Apr 11, 2024
@jsflax jsflax self-requested a review April 11, 2024 12:33
@jsflax
Copy link
Contributor

jsflax commented Apr 11, 2024

Does this have any customer facing implications? Was something not working on iOS before? Do we need a CHANGELOG entry?

@nielsenko nielsenko merged commit 9730126 into master Apr 11, 2024
@nielsenko nielsenko deleted the kn/fix-ios-compilation branch April 11, 2024 15:58
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

fix ios compilation after RCORE-2070
3 participants