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

Migrate brave-ios into brave-core #21553

Merged
merged 71 commits into from
Feb 12, 2024
Merged

Migrate brave-ios into brave-core #21553

merged 71 commits into from
Feb 12, 2024

Conversation

kylehickinson
Copy link
Collaborator

@kylehickinson kylehickinson commented Jan 11, 2024 •
edited by fmarier
Loading

Resolves

Sec review: https://github.com/brave/reviews/issues/1492

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run lint, npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@kylehickinson kylehickinson self-assigned this Jan 11, 2024
@github-actions github-actions bot added CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/storybook-url Deploy storybook and provide a unique URL for each build labels Jan 11, 2024
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@kylehickinson kylehickinson force-pushed the brave-ios-migration branch 2 times, most recently from a52f8ee to cd7915b Compare January 12, 2024 17:50
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@kylehickinson kylehickinson force-pushed the brave-ios-migration branch 2 times, most recently from 1cfcef4 to a9eb9e6 Compare January 15, 2024 18:20
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

1 similar comment
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@github-actions github-actions bot added CI/run-network-audit Run network-audit CI/run-upstream-tests Run upstream unit and browser tests on Linux and Windows (otherwise only on Linux) feature/web3/wallet feature/web3/wallet/core labels Jan 17, 2024
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@kylehickinson kylehickinson removed the CI/run-network-audit Run network-audit label Jan 17, 2024
@kylehickinson
Fix iPad test plan
4bfbfe2
@kylehickinson
Separate testflight build & upload into multiple fastlane runs
d1c9665
@kylehickinson
Add version string to MaterialComponents during preaction
41138b5
@kylehickinson
Add ability to pass in PUBLIC CI arg into fastlane upload lane
880925a
@kylehickinson
Cleanup config & presubmit rules
409041c
@kylehickinson
Add explicit licenses/README.chromium's for third party iOS deps
0aeeb44
@kylehickinson
Presubmit cleanup/fixes
c833838
@kylehickinson
Change Xcode preactions to run on xcframeworks instead of GN outputs
e858273 
This avoids rebuilds that are due to BraveCore.framework and MaterialComponents.framework folders being touched in the out directory when we cleanup chromium assets and fix the MaterialComponents Info.plist
@kylehickinson
Improve debugging when strip_absolute_paths_from_debug_symbols is true
4057521 
- The bootstrap script now generates an LLDBInit that is used for Debug schemes. This file contains an lldb target.source-map to allow lldb to resolve breakpoints
- SPM & Xcode now build with the `-debug-prefix-map` swift flag so that all iOS files built out of GN also have relative debug paths
- Replace compilation flags being defined with OTHER_SWIFT_FLAGS to use SWIFT_ACTIVE_COMPILATION_CONDITIONS instead
@kylehickinson
Remove SPM reload during preaction and use .env for Package.swift
62f4251 
This removes a race that could happen when reloading the package during the build
@kylehickinson
Add Action Extension provisioning profiles and fix its xcode build se…
d2d6103 
…ttings
@kylehickinson
Move xcframework creation command into separate file
a0f52ee
@kylehickinson
Fixup nvm/brew npm PATHs in Xcode pre-action script
1530e6b
@kylehickinson
Move iOS bootstrap into gclient runhook, rename current_link
f82ecd8
@kylehickinson
Bootstrap script improvements based on feedback
406f1e5
@kylehickinson
Rebase master/fix bootstrap import
8b31cf7
@kylehickinson
Bootstrap script improvements based on feedback pt2
d735d75
@kylehickinson
Revert Jenkinsfile change
f438dec
@kylehickinson
Move CheckNoJsInIos and CheckNoDeprecatedCss into permanent ignores
4a7b31c
@kylehickinson
Rebase master & fix wallet mock asset ratio service
4a08fb1
@mihaiplesa mihaiplesa merged commit c8f8ba0 into master Feb 12, 2024
8 of 16 checks passed
@mihaiplesa mihaiplesa deleted the brave-ios-migration branch February 12, 2024 18:26
@github-actions github-actions bot added this to the 1.64.x - Nightly milestone Feb 12, 2024
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@kylehickinson kylehickinson mentioned this pull request Feb 12, 2024
Merged
24 tasks
kylehickinson added a commit that referenced this pull request Feb 13, 2024
@kylehickinson
Uplift of #21553 (squashed) to beta
035f157
kjozwiak pushed a commit that referenced this pull request Feb 14, 2024
@kylehickinson
Migrate brave-ios into brave-core (uplift to 1.63.x) (#22001)
c3d5f57 
* Add brave-ios repo

* Uplift of #21553 (squashed) to beta

* Uplift of #22010 (squashed) to beta

* Fix mock asset ratio service after rebase
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mihaiplesa mihaiplesa mihaiplesa approved these changes

@fmarier fmarier fmarier approved these changes

@Brandon-T Brandon-T Brandon-T approved these changes

@goodov goodov goodov approved these changes

@iccub iccub iccub approved these changes

@bridiver bridiver Awaiting requested review from bridiver

Assignees

@kylehickinson kylehickinson

Labels
CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/storybook-url Deploy storybook and provide a unique URL for each build
Projects
None yet
Milestone
1.64.x - Release
Development

Successfully merging this pull request may close these issues.
7 participants
@kylehickinson @brave-builds @fmarier @mihaiplesa @Brandon-T @goodov @iccub