This repository has been archived by the owner on Mar 6, 2024. It is now read-only.
Fix #889: Compilation errors on master #890
Merged
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
|
Blockzilla.xcodeproj/project.pbxproj: I just said 'YES' to upgrading the file, hence the changes. |
garvankeeley
commented
May 16, 2018
| TPStatsBlocklistChecker.shared.isBlocked(url: url, enabledLists: enabled).uponQueue(.main) { listItem in | ||
| if let listItem = listItem { | ||
| self.trackingInformation = self.trackingInformation.create(byAddingListItem: listItem) | ||
| } |
There was a problem hiding this comment.
The above block of code was sitting on my computer locally, I missed pushing it up with my PR for upgrading the TP code.
garvankeeley
commented
May 16, 2018
| @@ -44,15 +44,17 @@ class WebViewController: UIViewController, WebController { | |||
| private var browserView = WKWebView() | |||
| var onePasswordExtensionItem: NSExtensionItem! | |||
| private var progressObserver: NSKeyValueObservation? | |||
| fileprivate var trackingProtecitonStatus = TrackingProtectionStatus.on(TrackingInformation()) { | |||
| private var trackingProtectionStatus = TrackingProtectionStatus.on(TPPageStats()) { | |||
There was a problem hiding this comment.
TrackingInformation is now called TPPageStats. This was another change that was part of my TP PR that was committed locally and not pushed. In future, we need CI running on my commits, I just assumed they were without checking if that was the case.
|
Hold on, I had better clean my carthage and rebuild one more time to make sure I am using vanilla master. |
fc6ab9f
to
0f9be22
Compare
|
I am going to break the law here and land this on master so I can quickly confirm this builds on BB |
isabelrios
pushed a commit
to isabelrios/firefox-ios
that referenced
this pull request
Feb 14, 2024
isabelrios
pushed a commit
to isabelrios/firefox-ios
that referenced
this pull request
Feb 20, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This builds with Xcode 9.3.1, turns out, this was due to a missing commit on my PR #869