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.

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

fix(cordova/apple/ios): remove overlapping dependencies between main app and AppKit bridge targets #1788

Merged
merged 19 commits into from
Nov 22, 2023

Conversation

sbruens
Copy link
Contributor

@sbruens sbruens commented Nov 21, 2023

This is a fix/workaround for #1784.

I moved the bridge to an interface and out of SPM. I also removed the duplicate dependencies CocoaLumberjack and AppKitBridgeProtocol. The latter has been replaced with an NSObject extension.

@sbruens sbruens changed the title fix(cordova/ios): remove overlapping dependencies between main app and AppKit bridge targets fix(cordova/apple/ios): remove overlapping dependencies between main app and AppKit bridge targets Nov 21, 2023
Copy link

codecov bot commented Nov 21, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (f38b935) 32% compared to head (72414f7) 32%.

Additional details and impacted files
@@          Coverage Diff           @@
##           master   #1788   +/-   ##
======================================
  Coverage      32%     32%           
======================================
  Files          45      45           
  Lines        2609    2609           
  Branches      337     337           
======================================
  Hits          859     859           
  Misses       1750    1750           
Flag Coverage Δ
apple 15% <ø> (ø)
ios 15% <ø> (ø)
maccatalyst 15% <ø> (ø)
macos 15% <ø> (ø)
unittests 32% <ø> (ø)
www 40% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sbruens sbruens marked this pull request as ready for review November 22, 2023 15:34
@sbruens sbruens requested a review from a team as a code owner November 22, 2023 15:34
Copy link
Collaborator

@fortuna fortuna left a comment

Choose a reason for hiding this comment

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

I think it looks ok. It's unfortunate we need to move files into the rsync directory, but we gotta do what we gotta do. The subproject approach should clean that up a bit.

One question: what's up with all the localization files being added?

@sbruens
Copy link
Contributor Author

sbruens commented Nov 22, 2023

I think it looks ok. It's unfortunate we need to move files into the rsync directory, but we gotta do what we gotta do. The subproject approach should clean that up a bit.

Agreed. After your subproject change I can take a stab at moving some of the stuff out of the SPM and move this over as well so we don't need to rsync these.

One question: what's up with all the localization files being added?

They are being moved (note: not added) out of SPM along with the Swift modules that depend on them.

@sbruens sbruens merged commit 8c52359 into master Nov 22, 2023
17 checks passed
@sbruens sbruens deleted the sbruens/catalyst-release branch November 22, 2023 18:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants