Use thread-safe adblock-rust build config on iOS (uplift to 1.48.x) #17283
Conversation
This file contains 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
github-actions
bot
added
the
CI/run-audit-deps
antonok-edm
force-pushed
the
pr17150_ios-thread-safe-adblock_1.48.x
branch
from
13aa84f to
66dac9b
Compare
antonok-edm
commented
Feb 19, 2023
| @@ -5,7 +5,7 @@ authors = ["Brian R. Bondy <[email protected]>"] | |||
| edition = "2018" | |||
|
|
|||
| [dependencies] | |||
| adblock = { version = "0.6.2", default-features = false, features = ["full-regex-handling", "object-pooling", "unsync-regex-caching"] } | |||
| adblock = { git = "https://github.com/brave/adblock-rust", rev = "5959733c38ad35f2639e435f5fc2d05695fdee67", default-features = false, features = ["full-regex-handling"] } | |||
There was a problem hiding this comment.
This is https://github.com/brave/adblock-rust/tree/5959733c38ad35f2639e435f5fc2d05695fdee67, which is just a direct fork from 0.6.2 with a backported commit. It's pinned under the brave-1.48.x branch.
I initially created a patch version release (0.6.4), but that's actually not going to work because 0.6.3 required some other brave-core changes to work correctly.
kjozwiak
approved these changes
Feb 21, 2023
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.
Uplift of #17150
Resolves brave/brave-ios#6254
Pre-approval checklist:
Pre-merge checklist:
Post-merge checklist: