SwiftLint build plugin

.github/workflows/codeql.yml

@@ -43,6 +43,7 @@ jobs:
         -target "DuckDuckGo" \
         -scheme "DuckDuckGo" \
         -destination "platform=iOS Simulator,name=iPhone 14,OS=16.4"
+        -skipPackagePluginValidation \
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

.github/workflows/end-to-end.yml

@@ -42,6 +42,7 @@ jobs:
           -scheme "DuckDuckGo" \
           -destination "platform=iOS Simulator,name=iPhone 14,OS=16.4" \
           -derivedDataPath "DerivedData" \
+          -skipPackagePluginValidation \
         | tee xcodebuild.log
 
     - name: Release tests

.github/workflows/nightly.yml

@@ -46,6 +46,7 @@ jobs:
           -scheme "AtbUITests" \
           -destination "platform=iOS Simulator,name=iPhone 14,OS=16.4" \
           -derivedDataPath "DerivedData" \
+          -skipPackagePluginValidation \
           | tee xcodebuild.log \
           | xcbeautify --report junit --report-path . --junit-report-filename unittests.xml
 
@@ -87,6 +88,7 @@ jobs:
           -scheme "FingerprintingUITests" \
           -destination "platform=iOS Simulator,name=iPhone 14,OS=16.4" \
           -derivedDataPath "DerivedData" \
+          -skipPackagePluginValidation \
           | xcbeautify --report junit --report-path . --junit-report-filename unittests.xml
 
     - name: Publish unit tests report

.github/workflows/pr.yml

@@ -15,7 +15,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
 
@@ -81,6 +81,7 @@ jobs:
           -scheme "DuckDuckGo" \
           -destination "platform=iOS Simulator,name=iPhone 14,OS=16.4" \
           -derivedDataPath "DerivedData" \
+          -skipPackagePluginValidation \
           DDG_SLOW_COMPILE_CHECK_THRESHOLD=250 \
           | tee xcodebuild.log \
           | xcbeautify --report junit --report-path . --junit-report-filename unittests.xml
@@ -183,6 +184,7 @@ jobs:
         -destination "platform=iOS Simulator,name=iPhone 14" \
         -derivedDataPath "DerivedData" \
         -configuration "Release" \
+        -skipPackagePluginValidation \
         | xcbeautify
 
   create-asana-task:

.github/workflows/sync-end-to-end.yml

@@ -42,6 +42,7 @@ jobs:
           -scheme "DuckDuckGo" \
           -destination "platform=iOS Simulator,name=iPhone 14" \
           -derivedDataPath "DerivedData" \
+          -skipPackagePluginValidation \
         | tee xcodebuild.log
 
     - name: Create test account for Sync and return the recovery code

.swiftlint.yml

@@ -1,3 +1,5 @@
+allow_zero_lintable_files: true
+
 disabled_rules:
   - discarded_notification_center_observer
   - notification_center_detachment

DuckDuckGo.xcodeproj/project.pbxproj

@@ -5374,6 +5374,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				B6080BB52B20B03800B418EF /* PBXTargetDependency */,
 				4B470EE7299C6DFB0086EBDC /* PBXTargetDependency */,
 			);
 			name = PacketTunnelProvider;
@@ -5395,6 +5396,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				B6080BBD2B20B05000B418EF /* PBXTargetDependency */,
 				025CCFE82582601C001CD5BB /* PBXTargetDependency */,
 			);
 			name = FingerprintingUITests;
@@ -5414,6 +5416,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				B6080BAF2B20B02800B418EF /* PBXTargetDependency */,
 			);
 			name = ShareExtension;
 			productName = ShareExtension;
@@ -5440,6 +5443,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				B6080BAD2B20B02400B418EF /* PBXTargetDependency */,
 				F143C2EA1E4A4CD400CFDE3A /* PBXTargetDependency */,
 				8390447520BDCE10006461CD /* PBXTargetDependency */,
 				85482D932462DCD100EDEDD1 /* PBXTargetDependency */,
@@ -5472,6 +5476,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				B6080BBB2B20B04D00B418EF /* PBXTargetDependency */,
 				84E341A81E2F7EFB00BDBA6F /* PBXTargetDependency */,
 			);
 			name = UnitTests;
@@ -5495,6 +5500,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				B6080BB32B20B03400B418EF /* PBXTargetDependency */,
 				85DF714924F7FE6100C89288 /* PBXTargetDependency */,
 			);
 			name = WidgetsExtension;
@@ -5516,6 +5522,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				B6080BB12B20B02B00B418EF /* PBXTargetDependency */,
 			);
 			name = OpenAction;
 			productName = OpenAction;
@@ -5533,6 +5540,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				B6080BBF2B20B05300B418EF /* PBXTargetDependency */,
 				85D33FD125C97B6E002B91A6 /* PBXTargetDependency */,
 			);
 			name = IntegrationTests;
@@ -5555,6 +5563,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				B6080BB92B20B04A00B418EF /* PBXTargetDependency */,
 				85F21DB3210F5E32002631A6 /* PBXTargetDependency */,
 			);
 			name = AtbUITests;
@@ -5576,6 +5585,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				B6080BC12B20B05600B418EF /* PBXTargetDependency */,
 				9825F9CC293F2DE900F220F2 /* PBXTargetDependency */,
 			);
 			name = PerformanceTests;
@@ -5612,6 +5622,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				B6080BB72B20B03B00B418EF /* PBXTargetDependency */,
 			);
 			name = Core;
 			packageProductDependencies = (
@@ -6996,6 +7007,50 @@
 			target = 84E341911E2F7EFB00BDBA6F /* DuckDuckGo */;
 			targetProxy = 9825F9CD293F2DE900F220F2 /* PBXContainerItemProxy */;
 		};
+		B6080BAD2B20B02400B418EF /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			productRef = B6080BAC2B20B02400B418EF /* SwiftLintPlugin */;
+		};
+		B6080BAF2B20B02800B418EF /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			productRef = B6080BAE2B20B02800B418EF /* SwiftLintPlugin */;
+		};
+		B6080BB12B20B02B00B418EF /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			productRef = B6080BB02B20B02B00B418EF /* SwiftLintPlugin */;
+		};
+		B6080BB32B20B03400B418EF /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			productRef = B6080BB22B20B03400B418EF /* SwiftLintPlugin */;
+		};
+		B6080BB52B20B03800B418EF /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			productRef = B6080BB42B20B03800B418EF /* SwiftLintPlugin */;
+		};
+		B6080BB72B20B03B00B418EF /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			productRef = B6080BB62B20B03B00B418EF /* SwiftLintPlugin */;
+		};
+		B6080BB92B20B04A00B418EF /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			productRef = B6080BB82B20B04A00B418EF /* SwiftLintPlugin */;
+		};
+		B6080BBB2B20B04D00B418EF /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			productRef = B6080BBA2B20B04D00B418EF /* SwiftLintPlugin */;
+		};
+		B6080BBD2B20B05000B418EF /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			productRef = B6080BBC2B20B05000B418EF /* SwiftLintPlugin */;
+		};
+		B6080BBF2B20B05300B418EF /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			productRef = B6080BBE2B20B05300B418EF /* SwiftLintPlugin */;
+		};
+		B6080BC12B20B05600B418EF /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			productRef = B6080BC02B20B05600B418EF /* SwiftLintPlugin */;
+		};
 		F143C2EA1E4A4CD400CFDE3A /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = F143C2E31E4A4CD400CFDE3A /* Core */;
@@ -9166,7 +9221,7 @@
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 94.0.2;
+				version = 94.0.3;
 			};
 		};
 		C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = {
@@ -9317,6 +9372,61 @@
 			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = Bookmarks;
 		};
+		B6080BAC2B20B02400B418EF /* SwiftLintPlugin */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = "plugin:SwiftLintPlugin";
+		};
+		B6080BAE2B20B02800B418EF /* SwiftLintPlugin */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = "plugin:SwiftLintPlugin";
+		};
+		B6080BB02B20B02B00B418EF /* SwiftLintPlugin */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = "plugin:SwiftLintPlugin";
+		};
+		B6080BB22B20B03400B418EF /* SwiftLintPlugin */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = "plugin:SwiftLintPlugin";
+		};
+		B6080BB42B20B03800B418EF /* SwiftLintPlugin */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = "plugin:SwiftLintPlugin";
+		};
+		B6080BB62B20B03B00B418EF /* SwiftLintPlugin */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = "plugin:SwiftLintPlugin";
+		};
+		B6080BB82B20B04A00B418EF /* SwiftLintPlugin */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = "plugin:SwiftLintPlugin";
+		};
+		B6080BBA2B20B04D00B418EF /* SwiftLintPlugin */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = "plugin:SwiftLintPlugin";
+		};
+		B6080BBC2B20B05000B418EF /* SwiftLintPlugin */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = "plugin:SwiftLintPlugin";
+		};
+		B6080BBE2B20B05300B418EF /* SwiftLintPlugin */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = "plugin:SwiftLintPlugin";
+		};
+		B6080BC02B20B05600B418EF /* SwiftLintPlugin */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = "plugin:SwiftLintPlugin";
+		};
 		C14882EC27F211A000D59F0C /* SwiftSoup */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */;

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/DuckDuckGo/BrowserServicesKit",
         "state": {
           "branch": null,
-          "revision": "861b8a72930f138cd18b6a7722502a8a40375827",
-          "version": "94.0.2"
+          "revision": "d07e18b3785d31c15364e56bdd2cb4b27edd35d0",
+          "version": "94.0.3"
         }
       },
       {

DuckDuckGo/AutocompleteRequest.swift

@@ -44,7 +44,7 @@ class AutocompleteRequest {
         var request = URLRequest.developerInitiated(url)
         request.allHTTPHeaderFields = APIRequest.Headers().httpHeaders
 
-        task = AutocompleteRequest.session.dataTask(with: request) { [weak self] (data, _, error) -> Void in
+        task = AutocompleteRequest.session.dataTask(with: request) { [weak self] (data, _, error) in
             guard let weakSelf = self else { return }
             do {
                 let suggestions = try weakSelf.processResult(data: data, error: error)

LocalPackages/DuckUI/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.7
 //  Package.swift
 //  DuckDuckGo
 //
@@ -30,10 +30,17 @@ let package = Package(
             name: "DuckUI",
             targets: ["DuckUI"])
     ],
-    dependencies: [],
+    dependencies: [
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "94.0.3"),
+    ],
     targets: [
         .target(
             name: "DuckUI",
-            dependencies: [])
+            dependencies: [],
+            swiftSettings: [
+                .define("DEBUG", .when(configuration: .debug))
+            ],
+            plugins: [.plugin(name: "SwiftLintPlugin", package: "BrowserServicesKit")]
+        )
     ]
 )

LocalPackages/SyncUI/Package.swift

@@ -32,6 +32,7 @@ let package = Package(
     ],
     dependencies: [
         .package(path: "../DuckUI"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "94.0.3"),
         .package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0")
     ],
     targets: [
@@ -40,6 +41,11 @@ let package = Package(
             dependencies: [
                 .product(name: "DuckUI", package: "DuckUI"),
                 "DesignResourcesKit"
-            ])
+            ],
+            swiftSettings: [
+                .define("DEBUG", .when(configuration: .debug))
+            ],
+            plugins: [.plugin(name: "SwiftLintPlugin", package: "BrowserServicesKit")]
+        )
     ]
 )

LocalPackages/Waitlist/Package.swift

@@ -15,17 +15,30 @@ let package = Package(
             targets: ["Waitlist", "WaitlistMocks"])
     ],
     dependencies: [
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "94.0.3"),
         .package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0")
     ],
     targets: [
         .target(
             name: "Waitlist",
-            dependencies: ["DesignResourcesKit"]),
+            dependencies: ["DesignResourcesKit"],
+            swiftSettings: [
+                .define("DEBUG", .when(configuration: .debug))
+            ],
+            plugins: [.plugin(name: "SwiftLintPlugin", package: "BrowserServicesKit")]
+        ),
         .target(
             name: "WaitlistMocks",
-            dependencies: ["Waitlist"]),
+            dependencies: ["Waitlist"],
+            swiftSettings: [
+                .define("DEBUG", .when(configuration: .debug))
+            ],
+            plugins: [.plugin(name: "SwiftLintPlugin", package: "BrowserServicesKit")]
+        ),
         .testTarget(
             name: "WaitlistTests",
-            dependencies: ["Waitlist", "WaitlistMocks"])
+            dependencies: ["Waitlist", "WaitlistMocks"],
+            plugins: [.plugin(name: "SwiftLintPlugin", package: "BrowserServicesKit")]
+        )
     ]
 )