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

Ships a focus megazord and updates to 93.2.0 #56

Merged
merged 5 commits into from May 13, 2022
Merged

Conversation

tarikeshaq
Copy link
Member

The rust-components-swift part of mozilla/application-services#4821

Needs mozilla/application-services#4953 to land first, that PR also has the high-level reasoning for this.

What's changed in this PR

  • We add a new library to ship, FocusAppServices that depends on a separate binary FocusRustComponents that has only the components the focus needs
  • Modifies the scripts to generate the appropriate swift code for focus, and place that in swift-source/focus
  • Moves the directory for the full binary into swift-source/all
  • Modifies the script that updates A-S to also update a focus version and checksum
  • Temporarily uses a circleci artifact, this will change to the release artifact before this lands

This will stay as a draft until mozilla/application-services#4953 lands and a release is cut.

@tarikeshaq tarikeshaq changed the title Ships a focus megazord [WIP] Ships a focus megazord May 9, 2022
@tarikeshaq
Copy link
Member Author

The changes in swift-source are all autogenerated, only real changes are in the generate.sh script, the Package.swift, the creation of the FocusRustComponentsWrapper and the automation/update_package_swift.py

@tarikeshaq
Copy link
Member Author

tarikeshaq commented May 12, 2022

mozilla/application-services#4953 was landed and v93.2.0 was cut that has the artifact for focus

This should be ready for review, I tested this branch against focus to make sure it builds ok

I also ran the update_package_swift script with 93.2.0 to make sure the changes work properly

Edit: Also verified locally that firefox-ios builds ok, just out of caution

@tarikeshaq tarikeshaq marked this pull request as ready for review May 12, 2022 03:29
@tarikeshaq tarikeshaq changed the title [WIP] Ships a focus megazord Ships a focus megazord and updates to 93.2.0 May 12, 2022
@tarikeshaq tarikeshaq requested a review from a team May 12, 2022 03:29
Copy link
Contributor

@skhamis skhamis left a comment

Choose a reason for hiding this comment

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

This seems good to me. One thing i'm wondering is if this will potentially break some local published flows since there could now be potentially mismatches in the uniffi generated code.

Though most likely both components would never be used at the same time so that may not be an issue. I guess it depends on how XCode pulls in the entire Package.swift

All in all -- this looks good. Thanks on working on this!

@tarikeshaq
Copy link
Member Author

Though most likely both components would never be used at the same time so that may not be an issue. I guess it depends on how XCode pulls in the entire Package.swift

Yeah I just double-checked 😬, in the package file in the apps it specifies which library it's using (firefox-ios has a section referencing MozillaAppServices, and focus-ios would reference FocusAppServices so as long as those don't change, the local flow shouldn't break, double checked by running the local script in firefox-ios

@tarikeshaq tarikeshaq merged commit cf57f9f into main May 13, 2022
@tarikeshaq tarikeshaq deleted the focus-megazord branch May 13, 2022 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants