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

Prepare iOS projects for megazording (i.e. remove file conflicts). #625

Merged
merged 2 commits into from
Feb 6, 2019
Merged

Prepare iOS projects for megazording (i.e. remove file conflicts). #625

merged 2 commits into from
Feb 6, 2019

Conversation

garvankeeley
Copy link
Contributor

@garvankeeley garvankeeley commented Feb 6, 2019 •
edited
Loading

Splitting up the iOS megazording, this would be the first step(s)

  1. rename files of the same name in the two projects,

  2. create components/support/ios for common files

@garvankeeley
Prepare iOS projects for megazording (remove file conflicts).
75e6fa6 
Splitting up the iOS megazording, this would be the first step(s)
1) rename files of the same name in the two projects,
2) Create SerialQueue.swift to remove `let queue = DispatchQueue(...)` duplicate def'n. The megazord will not include these files and instead have its own SerialQueue.swift (with `let queue = ...`) and all code will use that instance of `queue`.
@garvankeeley garvankeeley mentioned this pull request Feb 6, 2019
Closed
eoger
eoger approved these changes Feb 6, 2019
View reviewed changes
Copy link
Contributor

@eoger eoger left a comment

Choose a reason for hiding this comment

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

lgtm, make sure carthage build --archive works before landing!

@garvankeeley
Copy link
Contributor Author

garvankeeley commented Feb 6, 2019 •
edited
Loading

LGTM:

$ carthage build --archive
*** xcodebuild output can be found in /var/folders/qm/lt75scjd1hj_vmb2zgj7qx1r0000gn/T/carthage-xcodebuild.esNOEg.log
*** Building scheme "FxAClient" in FxAClient.xcodeproj
*** Building scheme "Logins" in Logins.xcodeproj
*** Found Carthage/Build/iOS/FxAClient.framework
*** Found Carthage/Build/iOS/FxAClient.framework.dSYM
*** Found Carthage/Build/iOS/Logins.framework
*** Found Carthage/Build/iOS/Logins.framework.dSYM
*** Found Carthage/Build/iOS/9053E744-5740-3D4B-9EFF-2DA7294526FE.bcsymbolmap
*** Found Carthage/Build/iOS/9176284B-75AA-3D18-923E-C5F02743355B.bcsymbolmap
*** Found Carthage/Build/iOS/8487B183-71BC-31C6-B56B-561B98619ED5.bcsymbolmap
*** Found Carthage/Build/iOS/9C3232C5-2DF9-3900-96EB-62578E36870D.bcsymbolmap
*** Created FxAClient.framework.zip

@garvankeeley garvankeeley merged commit f30711c into mozilla:master Feb 6, 2019
@thomcc thomcc mentioned this pull request Feb 6, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eoger eoger eoger approved these changes

@vladikoff vladikoff Awaiting requested review from vladikoff

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@garvankeeley @eoger