Code Review Bench PR #31468 - Refactor FXIOS-14466 [Swift 6 Migration] Migrate ShareTo and BrowserKit Package to Swift 6

BrowserKit/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.10
+// swift-tools-version: 6.2
 
 import PackageDescription
 
@@ -87,24 +87,18 @@ let package = Package(
             dependencies: ["Common"],
             swiftSettings: [
                 .unsafeFlags(["-enable-testing"]),
-                .enableExperimentalFeature("StrictConcurrency"),
-                .enableExperimentalFeature("RegionBasedIsolation")
             ]
         ),
         .target(
             name: "ComponentLibrary",
             dependencies: ["Common", "SiteImageView"],
             swiftSettings: [
                 .unsafeFlags(["-enable-testing"]),
-                .enableExperimentalFeature("StrictConcurrency"),
-                .enableUpcomingFeature("InferSendableFromCaptures"),
-                .enableExperimentalFeature("RegionBasedIsolation")
             ]),
         .testTarget(
             name: "ComponentLibraryTests",
             dependencies: ["ComponentLibrary"],
             swiftSettings: [
-                .enableExperimentalFeature("StrictConcurrency"),
             ]
         ),
         .target(
@@ -114,9 +108,6 @@ let package = Package(
             resources: [.process("BundledTopSitesFavicons.xcassets")],
             swiftSettings: [
                 .unsafeFlags(["-enable-testing"]),
-                .enableExperimentalFeature("StrictConcurrency"),
-                .enableUpcomingFeature("InferSendableFromCaptures"),
-                .enableExperimentalFeature("RegionBasedIsolation")
             ]),
         .testTarget(
             name: "SiteImageViewTests",
@@ -127,7 +118,6 @@ let package = Package(
                 .copy("Resources/hackernews.svg")
             ],
             swiftSettings: [
-                .enableExperimentalFeature("StrictConcurrency"),
             ],
         ),
         .target(
@@ -137,46 +127,35 @@ let package = Package(
                            .product(name: "Sentry-Dynamic", package: "sentry-cocoa")],
             swiftSettings: [
                 .unsafeFlags(["-enable-testing"]),
-                .enableExperimentalFeature("StrictConcurrency"),
-                .enableUpcomingFeature("InferSendableFromCaptures"),
-                .enableExperimentalFeature("RegionBasedIsolation")
             ]
         ),
         .testTarget(
             name: "CommonTests",
             dependencies: ["Common"],
             swiftSettings: [
-                .enableExperimentalFeature("StrictConcurrency")
             ]),
         .target(
             name: "TabDataStore",
             dependencies: ["Common"],
             swiftSettings: [
                 .unsafeFlags(["-enable-testing"]),
-                .enableExperimentalFeature("StrictConcurrency"),
-                .enableExperimentalFeature("RegionBasedIsolation")
             ]),
         .testTarget(
             name: "TabDataStoreTests",
             dependencies: ["TabDataStore"],
             swiftSettings: [
-                .enableExperimentalFeature("StrictConcurrency"),
             ]
         ),
         .target(
             name: "Redux",
             dependencies: ["Common"],
             swiftSettings: [
                 .unsafeFlags(["-enable-testing"]),
-                .enableExperimentalFeature("StrictConcurrency"),
-                .enableExperimentalFeature("RegionBasedIsolation")
             ]),
         .testTarget(
             name: "ReduxTests",
             dependencies: ["Redux"],
             swiftSettings: [
-                .enableExperimentalFeature("StrictConcurrency"),
-                .enableExperimentalFeature("RegionBasedIsolation")
             ]
         ),
         .target(
@@ -185,44 +164,34 @@ let package = Package(
                            .product(name: "GCDWebServers", package: "GCDWebServer")],
             swiftSettings: [
                 .unsafeFlags(["-enable-testing"]),
-                .enableExperimentalFeature("StrictConcurrency"),
-                .enableExperimentalFeature("RegionBasedIsolation")
             ]),
         .testTarget(
             name: "WebEngineTests",
             dependencies: ["WebEngine"],
             swiftSettings: [
-                .enableExperimentalFeature("StrictConcurrency"),
             ]
         ),
         .target(
             name: "ToolbarKit",
             dependencies: ["Common"],
             swiftSettings: [
                 .unsafeFlags(["-enable-testing"]),
-                .enableExperimentalFeature("StrictConcurrency"),
-                .enableUpcomingFeature("InferSendableFromCaptures"),
-                .enableExperimentalFeature("RegionBasedIsolation")
             ]),
         .testTarget(
             name: "ToolbarKitTests",
             dependencies: ["ToolbarKit"],
             swiftSettings: [
-                .enableExperimentalFeature("StrictConcurrency")
         ]),
         .target(
             name: "MenuKit",
             dependencies: ["Common", "ComponentLibrary"],
             swiftSettings: [
                 .unsafeFlags(["-enable-testing"]),
-                .enableExperimentalFeature("StrictConcurrency"),
-                .enableExperimentalFeature("RegionBasedIsolation")
             ]),
         .testTarget(
             name: "MenuKitTests",
             dependencies: ["MenuKit"],
             swiftSettings: [
-                .enableExperimentalFeature("StrictConcurrency"),
             ]
         ),
         .target(
@@ -234,53 +203,41 @@ let package = Package(
             ],
             swiftSettings: [
                 .unsafeFlags(["-enable-testing"]),
-                .enableExperimentalFeature("StrictConcurrency"),
-                .enableExperimentalFeature("RegionBasedIsolation")
             ]
         ),
         .testTarget(name: "SummarizeKitTests",
                     dependencies: ["SummarizeKit"],
                     swiftSettings: [
                         .unsafeFlags(["-enable-testing"]),
-                        .enableExperimentalFeature("StrictConcurrency")
                     ]),
         .target(
             name: "JWTKit",
             dependencies: ["Common", "Shared"],
             swiftSettings: [
                 .unsafeFlags(["-enable-testing"]),
-                .enableExperimentalFeature("StrictConcurrency"),
-                .enableExperimentalFeature("RegionBasedIsolation")
             ]
         ),
         .testTarget(
             name: "JWTKitTests",
             dependencies: ["JWTKit"],
             swiftSettings: [
-                .enableExperimentalFeature("StrictConcurrency"),
-                .enableExperimentalFeature("RegionBasedIsolation")
             ]
         ),
         .target(
             name: "UnifiedSearchKit",
             dependencies: ["Common", "ComponentLibrary", "MenuKit"],
             swiftSettings: [
                 .unsafeFlags(["-enable-testing"]),
-                .enableExperimentalFeature("StrictConcurrency"),
-                .enableExperimentalFeature("RegionBasedIsolation")
             ]),
         .target(
             name: "ContentBlockingGenerator",
             swiftSettings: [
                 .unsafeFlags(["-enable-testing"]),
-                .enableExperimentalFeature("StrictConcurrency"),
-                .enableExperimentalFeature("RegionBasedIsolation")
             ]),
         .testTarget(
             name: "ContentBlockingGeneratorTests",
             dependencies: ["ContentBlockingGenerator"],
             swiftSettings: [
-                .enableExperimentalFeature("StrictConcurrency")
             ]),
         .target(
             name: "OnboardingKit",
@@ -290,8 +247,6 @@ let package = Package(
             ],
             swiftSettings: [
                 .unsafeFlags(["-enable-testing"]),
-                .enableExperimentalFeature("StrictConcurrency"),
-                .enableExperimentalFeature("RegionBasedIsolation")
             ],
             linkerSettings: [
                 .linkedFramework("Metal"),
@@ -301,21 +256,16 @@ let package = Package(
             name: "OnboardingKitTests",
             dependencies: ["OnboardingKit"],
             swiftSettings: [
-                .enableExperimentalFeature("StrictConcurrency"),
-                .enableExperimentalFeature("RegionBasedIsolation")
             ]),
         .target(
             name: "ActionExtensionKit",
             swiftSettings: [
                 .unsafeFlags(["-enable-testing"]),
-                .enableExperimentalFeature("StrictConcurrency"),
-                .enableExperimentalFeature("RegionBasedIsolation")
             ]),
         .testTarget(
             name: "ActionExtensionKitTests",
             dependencies: ["ActionExtensionKit"],
             swiftSettings: [
-                .enableExperimentalFeature("StrictConcurrency"),
             ]),
         .executableTarget(
             name: "ExecutableContentBlockingGenerator",

BrowserKit/Sources/ExecutableContentBlockingGenerator/MainContentBlockerGenerator.swift

@@ -1,12 +1,9 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/
-
 import ContentBlockingGenerator
 
 @main
 public struct MainContentBlockerGenerator {
-    static let generator = ContentBlockerGenerator.factory()
+    // FXIOS-14548 ContentBlockerGenerator is not thread safe
+    nonisolated(unsafe) static let generator = ContentBlockerGenerator.factory()
 
     // Static main needs to be used for executable, providing an instance so we can
     // call it from a terminal

BrowserKit/Tests/SiteImageViewTests/SVGImageProcessorTests.swift

@@ -9,7 +9,7 @@ import Kingfisher
 import GCDWebServers
 
 class SVGImageProcessorTests: XCTestCase, @unchecked Sendable {
-    func testDownloadingSVGImage_withKingfisherProcessor_forStandardSVGCase() async {
+    func testDownloadingSVGImage_withKingfisherProcessor_forStandardSVGCase() {
         let assetType: AssetType = .svgCase1
         let expectedRasterSize = CGSize(width: 360, height: 360)
 
@@ -18,32 +18,26 @@ class SVGImageProcessorTests: XCTestCase, @unchecked Sendable {
             return
         }
 
-        guard let mockedURL = try? await startMockImageServer(imageData: imageData, forAssetType: assetType) else {
+        guard let mockedURL = try? startMockImageServer(imageData: imageData, forAssetType: assetType) else {
             XCTFail("Check bundle setup for mock server response data")
             return
         }
 
-        let exp = expectation(description: "Image download and parse")
-
         let siteDownloader = DefaultSiteImageDownloader()
         siteDownloader.downloadImage(with: mockedURL, options: [.processor(SVGImageProcessor())]) { result in
             switch result {
             case .success(let result):
                 XCTAssertEqual(result.originalData, imageData)
                 XCTAssertEqual(result.url, mockedURL)
                 XCTAssertEqual(result.image.size, expectedRasterSize)
-                exp.fulfill()
             case .failure(let error):
                 XCTFail("Should not have an error: \(error) \(error.errorDescription ?? "")")
-                exp.fulfill()
             }
         }
-
-        await fulfillment(of: [exp], timeout: 2.0)
     }
 
     /// FXIOS-11361: Tests a special SVG which previously caused crashes in older versions of SwiftDraw.
-    func testDownloadingSVGImage_withKingfisherProcessor_forSpecialSVGCase() async {
+    func testDownloadingSVGImage_withKingfisherProcessor_forSpecialSVGCase() {
         let assetType: AssetType = .svgCase2
         let expectedRasterSize = CGSize(width: 360, height: 360)
 
@@ -52,7 +46,7 @@ class SVGImageProcessorTests: XCTestCase, @unchecked Sendable {
             return
         }
 
-        guard let mockedURL = try? await startMockImageServer(imageData: imageData, forAssetType: assetType) else {
+        guard let mockedURL = try? startMockImageServer(imageData: imageData, forAssetType: assetType) else {
             XCTFail("Check bundle setup for mock server response data")
             return
         }
@@ -73,18 +67,18 @@ class SVGImageProcessorTests: XCTestCase, @unchecked Sendable {
             }
         }
 
-        await fulfillment(of: [exp], timeout: 2.0)
+        wait(for: [exp], timeout: 2.0)
     }
 
-    func testDownloadingICOImage_withKingfisherProcessor() async {
+    func testDownloadingICOImage_withKingfisherProcessor() {
         let assetType: AssetType = .ico
 
         guard let imageData = try? dataFor(type: assetType) else {
             XCTFail("Could not load test asset")
             return
         }
 
-        guard let mockedURL = try? await startMockImageServer(imageData: imageData, forAssetType: assetType) else {
+        guard let mockedURL = try? startMockImageServer(imageData: imageData, forAssetType: assetType) else {
             XCTFail("Check bundle setup for mock server response data")
             return
         }
@@ -104,16 +98,16 @@ class SVGImageProcessorTests: XCTestCase, @unchecked Sendable {
             }
         }
 
-        await fulfillment(of: [exp], timeout: 2.0)
+        wait(for: [exp], timeout: 2.0)
     }
 
-    func testDownloadingGarbageData_withKingfisherProcessor() async {
+    func testDownloadingGarbageData_withKingfisherProcessor() {
         guard let garbageData = try? dataFor(type: .badType) else {
             XCTFail("Could not load test asset")
             return
         }
 
-        guard let mockedURL = try? await startMockImageServer(imageData: garbageData, forAssetType: .badType) else {
+        guard let mockedURL = try? startMockImageServer(imageData: garbageData, forAssetType: .badType) else {
             XCTFail("Check bundle setup for mock server response data")
             return
         }
@@ -131,13 +125,13 @@ class SVGImageProcessorTests: XCTestCase, @unchecked Sendable {
             }
         }
 
-        await fulfillment(of: [exp], timeout: 2.0)
+        wait(for: [exp], timeout: 2.0)
     }
 
-    func testDownloadingEmptyImage_withKingfisherProcessor() async {
+    func testDownloadingEmptyImage_withKingfisherProcessor() {
         let emptyData = Data()
 
-        guard let mockedURL = try? await startMockImageServer(imageData: emptyData, forAssetType: .ico) else {
+        guard let mockedURL = try? startMockImageServer(imageData: emptyData, forAssetType: .ico) else {
             XCTFail("Check bundle setup for mock server response data")
             return
         }
@@ -155,7 +149,7 @@ class SVGImageProcessorTests: XCTestCase, @unchecked Sendable {
             }
         }
 
-        await fulfillment(of: [exp], timeout: 2.0)
+        wait(for: [exp], timeout: 2.0)
     }
 }
 
@@ -211,9 +205,6 @@ extension SVGImageProcessorTests {
         throw MockImageServerError.noAssetData
     }
 
-    // GDCWebServer must be initialized for the first time on the main thread
-    // So this @MainActor ensures that if this test file is run alone it will not crash
-    @MainActor
     func startMockImageServer(imageData: Data, forAssetType assetType: AssetType) throws -> URL {
         let webServer = GCDWebServer()