Skip to content
This repository has been archived by the owner on Mar 6, 2024. It is now read-only.

Fix #889: Compilation errors on master #890

Conversation

garvankeeley
Copy link
Contributor

@garvankeeley garvankeeley commented May 16, 2018

This builds with Xcode 9.3.1, turns out, this was due to a missing commit on my PR #869

@garvankeeley
Copy link
Contributor Author

Blockzilla.xcodeproj/project.pbxproj: I just said 'YES' to upgrading the file, hence the changes.

TPStatsBlocklistChecker.shared.isBlocked(url: url, enabledLists: enabled).uponQueue(.main) { listItem in
if let listItem = listItem {
self.trackingInformation = self.trackingInformation.create(byAddingListItem: listItem)
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The above block of code was sitting on my computer locally, I missed pushing it up with my PR for upgrading the TP code.

@@ -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()) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

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.

@garvankeeley garvankeeley requested a review from st3fan May 16, 2018 21:26
@garvankeeley
Copy link
Contributor Author

Hold on, I had better clean my carthage and rebuild one more time to make sure I am using vanilla master.

@garvankeeley garvankeeley force-pushed the garvan/fix-compilation-for-v4.0.1 branch from fc6ab9f to 0f9be22 Compare May 16, 2018 21:35
@garvankeeley
Copy link
Contributor Author

I am going to break the law here and land this on master so I can quickly confirm this builds on BB

@garvankeeley garvankeeley merged commit cb31e24 into mozilla-mobile:master May 16, 2018
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.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant