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

Prevents VPNSettings from reporting fake changes #2288

Merged
merged 4 commits into from
Dec 22, 2023
Merged

Prevents VPNSettings from reporting fake changes #2288

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05091bd
Updates BSK
diegoreymendez Dec 22, 2023
0d96357
Merges the latest from main
diegoreymendez Dec 22, 2023
59589b7
Fixes a swiftlint violation
diegoreymendez Dec 22, 2023
24533ff
Updates BSK
diegoreymendez Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9224,8 +9224,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 99.0.0;
kind = revision;
revision = a0398c48081cdec0d862f563359376dbf5be0ce6;
};
};
C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = {
Expand Down
3 changes: 1 addition & 2 deletions DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
"state" : {
"revision" : "2c1c2bb0aad5a23524e298fa9bea9b890ae43e23",
"version" : "99.0.0"
"revision" : "a0398c48081cdec0d862f563359376dbf5be0ce6"
}
},
{
Expand Down
1 change: 0 additions & 1 deletion DuckDuckGo/ConfigurationDebugViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ class ConfigurationDebugViewController: UITableViewController {
}
}

// swiftlint:disable:next cyclomatic_complexity
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was triggering a swiftlint alert. I didn't introduce it but it was failing in the CI tests so I have to address this here.

override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
switch Sections(rawValue: indexPath.section) {
case .refreshInformation:
Expand Down
Loading