Repository navigation
xtask: Use a single Swift module when building the bindings. - #6388
Merged
Merged
Conversation
2 tasks
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #6388 +/- ##
==========================================
+ Coverage 89.86% 89.88% +0.02%
==========================================
Files 377 377
Lines 103167 103167
Branches 103167 103167
==========================================
+ Hits 92710 92734 +24
+ Misses 6893 6883 -10
+ Partials 3564 3550 -14 ☔ View full report in Codecov by Sentry. |
pixlwave
force-pushed
the
doug/xcode-26.4
branch
from
March 31, 2026 19:07
25aa38b to
83cee31
Compare
This fixes support for Xcode 26.4.
pixlwave
force-pushed
the
doug/xcode-26.4
branch
from
March 31, 2026 19:50
83cee31 to
44db10d
Compare
Hywan
approved these changes
Apr 1, 2026
Hywan
left a comment
Member
There was a problem hiding this comment.
Looks good to me! Thank you for fixing the problem.
| } | ||
|
|
||
| if let Some(last_header_position) = last_header_position { | ||
| lines.splice(last_header_position + 1..last_header_position + 1, extra_headers); |
Member
There was a problem hiding this comment.
Nice trick to insert a vec in a vec.
lucasfeijo
added a commit
to lucasfeijo/matrix-rust-components-swift
that referenced
this pull request
Apr 8, 2026
…t-sdk#6388) Made-with: Cursor
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Xcode 26.4 didn't like the modulemap we were generating. It used to look like so:
I think the main issue was that this defines modules that don't match the
MatrixSDKFFIname defined by the Package.swift files (SDK / Components). It seems this is now not allowed.This PR updates the consolidation to a single module containing all of the headers:
To make this work we then need to make sure all the of
.swiftfilesimport MatrixSDKFFInow instead of whatever their corresponding UniFFI module name was.Fixes matrix-org/matrix-rust-components-swift#32
Fixes element-hq/element-x-ios#5321
CHANGELOG.mdfiles.