Skip to content

Commit

Permalink
Merge branch 'main' into sam/add-netp-subscription-auth-support
Browse files Browse the repository at this point in the history
* main: (39 commits)
  Fix privacy config fetch in debug mode (#606)
  Expose Internal User managing from Config (#610)
  Add Sync feature flags (#607)
  Fix Networking import into TestUtils (#609)
  Add Sync Success Rate pixel (#605)
  Add new logger (#604)
  Prevent VPN server list persistence failures (#603)
  SwiftLint plugin (#393)
  Update autofill to 10.0.2 (#599)
  Remove the reconnect/disconnect logic from the connection tester
  Fix an IPv6 regression. (#598)
  Quality metrics for Sync (#597)
  Report NetP connection attempts, tunnel failures, and latency (#584)
  Implement deleteAccount Sync endpoint (#596)
  Ensure that LinkPresentation framework is called on main thread (#595)
  No longer excluding the 10.0.0.0/8 range (#594)
  Update autofill to 10.0.1 (#591)
  Implement deleteAccount Sync endpoint (#596)
  Ensure that LinkPresentation framework is called on main thread (#595)
  No longer excluding the 10.0.0.0/8 range (#594)
  ...
  • Loading branch information
samsymons committed Dec 21, 2023
2 parents 22506de + ea133ab commit a2e41db
Show file tree
Hide file tree
Showing 448 changed files with 8,603 additions and 3,573 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: SwiftLint
uses: docker://norionomura/swiftlint:0.53.0
uses: docker://norionomura/swiftlint:0.54.0_swift-5.9.0
with:
args: swiftlint --reporter github-actions-logging --strict

Expand Down Expand Up @@ -48,7 +48,11 @@ jobs:
if: env.cache_key_hash
uses: actions/cache@v3
with:
path: .build
path: |
.build/artifacts
.build/checkouts
.build/repositories
.build/workspace-state.json
key: ${{ runner.os }}-spm-${{ env.cache_key_hash }}
restore-keys: |
${{ runner.os }}-spm-
Expand Down
80 changes: 70 additions & 10 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,82 @@
allow_zero_lintable_files: true

disabled_rules:
- trailing_whitespace
- no_space_in_method_call
- multiple_closures_with_trailing_closure
- block_based_kvo
- compiler_protocol_init
- unused_setter_value
- line_length
- type_name
- implicit_getter
- function_parameter_count
- trailing_comma
- nesting
- opening_brace

opt_in_rules:
- file_header
- explicit_init

custom_rules:
explicit_non_final_class:
included: ".*\\.swift"
name: "Implicitly non-final class"
regex: "^\\s*(class) (?!func|var)"
capture_group: 0
match_kinds:
- keyword
message: "Classes should be `final` by default, use explicit `internal` or `public` for non-final classes."
severity: error
enforce_os_log_wrapper:
included: ".*\\.swift"
name: "Use `import Common` for os_log instead of `import os.log`"
regex: "^(import (?:os\\.log|os|OSLog))$"
capture_group: 0
message: "os_log wrapper ensures log args are @autoclosures (computed when needed) and to be able to use String Interpolation."
severity: error

line_length:
warning: 150
ignores_comments: true
analyzer_rules: # Rules run by `swiftlint analyze`
- explicit_self

# Rule Config
identifier_name:
min_length: 1
max_length: 1000
file_length:
warning: 1200
error: 1200
type_body_length:
warning: 500
error: 500
large_tuple:
warning: 4
error: 5
file_header:
required_pattern: |
\/\/
\/\/ SWIFTLINT_CURRENT_FILENAME
\/\/
\/\/ Copyright © \d{4} DuckDuckGo\. All rights reserved\.
\/\/
\/\/ Licensed under the Apache License, Version 2\.0 \(the \"License\"\);
\/\/ you may not use this file except in compliance with the License\.
\/\/ You may obtain a copy of the License at
\/\/
\/\/ http:\/\/www\.apache\.org\/licenses\/LICENSE-2\.0
\/\/
\/\/ Unless required by applicable law or agreed to in writing, software
\/\/ distributed under the License is distributed on an \"AS IS\" BASIS,
\/\/ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.
\/\/ See the License for the specific language governing permissions and
\/\/ limitations under the License\.
\/\/
type_name:
min_length: 3
max_length:
warning: 80
error: 100

# General Config
excluded:
- Package.swift
- .build
- scripts/
- Sources/RemoteMessaging/Model/AnyDecodable.swift
- Sources/Common/Concurrency/AsyncStream.swift

16 changes: 8 additions & 8 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/duckduckgo-autofill.git",
"state" : {
"revision" : "93677cc02cfe650ce7f417246afd0e8e972cd83e",
"version" : "10.0.0"
"revision" : "5597bc17709c8acf454ecaad4f4082007986242a",
"version" : "10.0.2"
}
},
{
Expand All @@ -41,8 +41,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/privacy-dashboard",
"state" : {
"revision" : "b4ac92a444e79d5651930482623b9f6dc9265667",
"version" : "2.0.0"
"revision" : "38336a574e13090764ba09a6b877d15ee514e371",
"version" : "3.1.1"
}
},
{
Expand All @@ -59,8 +59,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-argument-parser",
"state" : {
"revision" : "6b2aa2748a7881eebb9f84fb10c01293e15b52ca",
"version" : "0.5.0"
"revision" : "c8ed701b513cf5177118a175d85fbbbcd707ab41",
"version" : "1.3.0"
}
},
{
Expand All @@ -86,8 +86,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/TrackerRadarKit",
"state" : {
"revision" : "4684440d03304e7638a2c8086895367e90987463",
"version" : "1.2.1"
"revision" : "a6b7ba151d9dc6684484f3785293875ec01cc1ff",
"version" : "1.2.2"
}
},
{
Expand Down
Loading

0 comments on commit a2e41db

Please sign in to comment.