Update to Xcode 15.1

.github/workflows/alpha.yml

@@ -77,7 +77,7 @@ jobs:
 
       # Using Xcode 15 as the alpha build uses iOS 17 APIs
     - name: Select Xcode
-      run: sudo xcode-select -s /Applications/Xcode_15.0.1.app/Contents/Developer
+      run: sudo xcode-select -s /Applications/Xcode_$(<.xcode-version).app/Contents/Developer
 
     - name: Prepare fastlane
       run: bundle install

.github/workflows/pr.yml

@@ -79,7 +79,7 @@ jobs:
       run: |
         set -o pipefail && xcodebuild test \
           -scheme "DuckDuckGo" \
-          -destination "platform=iOS Simulator,name=iPhone 14,OS=16.4" \
+          -destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
           -derivedDataPath "DerivedData" \
           -skipPackagePluginValidation \
           DDG_SLOW_COMPILE_CHECK_THRESHOLD=250 \

.xcode-version

@@ -1 +1 @@
-14.3.1
+15.1

Core/BookmarksCachingSearch.swift

@@ -74,8 +74,8 @@ public class CoreDataBookmarksSearchStore: BookmarksSearchStore {
         fetchRequest.relationshipKeyPathsForPrefetching = [#keyPath(BookmarkEntity.favoriteFolders)]
 
         context.perform {
-            let result = try? context.fetch(fetchRequest) as? [Dictionary<String, Any>]
-            
+            let result = try? context.fetch(fetchRequest) as? [[String: Any]]
+
             let bookmarksAndFavorites = result?.compactMap(BookmarksCachingSearch.ScoredBookmark.init) ?? []
 
             DispatchQueue.main.async {

DuckDuckGo.xcodeproj/project.pbxproj

@@ -5661,7 +5661,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1420;
-				LastUpgradeCheck = 1250;
+				LastUpgradeCheck = 1500;
 				ORGANIZATIONNAME = DuckDuckGo;
 				TargetAttributes = {
 					02025661298818B100E694E7 = {
@@ -8121,6 +8121,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "-ld_classic";
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG APP_TRACKING_PROTECTION NETWORK_PROTECTION";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -8176,6 +8177,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_LDFLAGS = "-ld_classic";
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = NETWORK_PROTECTION;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -8651,6 +8653,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "-ld_classic";
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG NETWORK_PROTECTION ALPHA";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/AdhocDebug.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/AtbUITests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Core.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo-Alpha.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
-   version = "1.7">
+   LastUpgradeVersion = "1500"
+   version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/FingerprintingUITests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Instruments.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/OpenAction.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1500"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction
@@ -94,6 +94,7 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
       launchAutomaticallySubstyle = "2">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/PacketTunnelProvider.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1420"
+   LastUpgradeVersion = "1500"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1410"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/ShareExtension.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1500"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction
@@ -103,6 +103,7 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
       launchAutomaticallySubstyle = "2">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/WidgetsExtension.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1320"
+   LastUpgradeVersion = "1500"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

DuckDuckGo/AppDelegate.swift

@@ -481,10 +481,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     private func onApplicationLaunch(_ application: UIApplication) {
-        beginAuthentication()
-        initialiseBackgroundFetch(application)
-        applyAppearanceChanges()
-        refreshRemoteMessages()
+        Task { @MainActor in
+            await beginAuthentication()
+            initialiseBackgroundFetch(application)
+            applyAppearanceChanges()
+            refreshRemoteMessages()
+        }
     }
 
     private func applyAppearanceChanges() {
@@ -503,10 +505,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func applicationWillEnterForeground(_ application: UIApplication) {
         ThemeManager.shared.updateUserInterfaceStyle()
 
-        beginAuthentication()
-        autoClear?.applicationWillMoveToForeground()
-        showKeyboardIfSettingOn = true
-        syncService.scheduler.resumeSyncQueue()
+        Task { @MainActor in
+            await beginAuthentication()
+            autoClear?.applicationWillMoveToForeground()
+            showKeyboardIfSettingOn = true
+            syncService.scheduler.resumeSyncQueue()
+        }
     }
 
     func applicationDidEnterBackground(_ application: UIApplication) {
@@ -634,7 +638,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         window?.isHidden = true
     }
 
-    private func beginAuthentication() {
+    private func beginAuthentication() async {
 
         guard privacyStore.authenticationEnabled else { return }
 
@@ -646,7 +650,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             return
         }
 
-        controller.beginAuthentication { [weak self] in
+        await controller.beginAuthentication { [weak self] in
             self?.removeOverlay()
             self?.showKeyboardOnLaunch()
         }

DuckDuckGo/AuthenticationViewController.swift

@@ -50,28 +50,29 @@ class AuthenticationViewController: UIViewController {
         return .portrait
     }
 
-    public func beginAuthentication(completion: (() -> Void)?) {
+    public func beginAuthentication(completion: (() -> Void)?) async {
         self.completion = completion
         if authenticator.canAuthenticate() {
-            authenticate()
+            await authenticate()
         } else {
             onCouldNotAuthenticate()
         }
     }
 
-    private func authenticate() {
+    private func authenticate() async {
         hideUnlockInstructions()
-        authenticator.authenticate { (success, _) in
-            if success {
-                self.onAuthenticationSucceeded()
-            } else {
-                self.onAuthenticationFailed()
-            }
+        let success = await authenticator.authenticate(reason: UserText.appUnlock)
+        if success {
+            self.onAuthenticationSucceeded()
+        } else {
+            self.onAuthenticationFailed()
         }
     }
 
     @IBAction func onTap(_ sender: Any) {
-        authenticate()
+        Task { @MainActor in
+            await authenticate()
+        }
     }
 
     private func onCouldNotAuthenticate() {

DuckDuckGo/AutofillLoginSettingsListViewController.swift

@@ -453,9 +453,7 @@ final class AutofillLoginSettingsListViewController: UIViewController {
     private func updateConstraintConstants() {
         let isIPhoneLandscape = traitCollection.containsTraits(in: UITraitCollection(verticalSizeClass: .compact))
         if isIPhoneLandscape {
-            let viewVerticalCenter = view.frame.height / 2
-            let lockedViewHeight = max(lockedView.frame.height, 120.0)
-            lockedViewBottomConstraint.constant = viewVerticalCenter - (lockedViewHeight / 2.0)
+            lockedViewBottomConstraint.constant = (view.frame.height / 2.0 - max(lockedView.frame.height, 120.0) / 2.0)
         } else {
             lockedViewBottomConstraint.constant = view.frame.height * 0.15
         }

DuckDuckGo/FirewallManager.swift

@@ -61,8 +61,8 @@ public class FirewallManager: FirewallManaging {
     public static let apptpLog: OSLog = OSLog(subsystem: Bundle.main.bundleIdentifier ?? AppVersion.shared.identifier, category: "AppTP")
 
     var manager: NETunnelProviderManager?
-    public var delegate: FirewallDelegate?
-    
+    public weak var delegate: FirewallDelegate?
+
     public init() {
         NotificationCenter.default.addObserver(self, selector: #selector(statusDidChange),
                                                name: .NEVPNStatusDidChange, object: nil)

DuckDuckGoTests/ContentBlockingUpdatingTests.swift

@@ -24,7 +24,7 @@ import TrackerRadarKit
 import BrowserServicesKit
 @testable import DuckDuckGo
 
-class ContentBlockingUpdatingTests: XCTestCase {
+final class ContentBlockingUpdatingTests: XCTestCase {
     let appSettings = AppSettingsMock()
     let configManager = PrivacyConfigurationManagerMock()
     let rulesManager = ContentBlockerRulesManagerMock()
@@ -278,8 +278,7 @@ class ContentBlockingUpdatingTests: XCTestCase {
 
     static let tracker = KnownTracker(domain: "tracker.com",
                                defaultAction: .block,
-                               owner: KnownTracker.Owner(name: "Tracker Inc",
-                                                         displayName: "Tracker Inc company"),
+                               owner: KnownTracker.Owner(name: "Tracker Inc", displayName: "Tracker Inc company"),
                                prevalence: 0.1,
                                subdomains: nil,
                                categories: nil,
@@ -313,24 +312,16 @@ class ContentBlockingUpdatingTests: XCTestCase {
 }
 
 extension UserContentControllerNewContent {
-    func rules(withName name: String) -> WKContentRuleList? {
-        rulesUpdate.rules.first(where: { $0.name == name })?.rulesList
-    }
+    func rules(withName name: String) -> WKContentRuleList? { rulesUpdate.rules.first(where: { $0.name == name })?.rulesList }
 
-    var isValid: Bool {
-        return rules(withName: "test") != nil
-    }
+    var isValid: Bool { rules(withName: "test") != nil }
 }
 
 extension WKContentRuleList {
 
     private static var isSwizzled = false
-    private static let originalDealloc = {
-        class_getInstanceMethod(WKContentRuleList.self, NSSelectorFromString("dealloc"))!
-    }()
-    private static let swizzledDealloc = {
-        class_getInstanceMethod(WKContentRuleList.self, #selector(swizzled_dealloc))!
-    }()
+    private static let originalDealloc = { class_getInstanceMethod(WKContentRuleList.self, NSSelectorFromString("dealloc"))! }()
+    private static let swizzledDealloc = { class_getInstanceMethod(WKContentRuleList.self, #selector(swizzled_dealloc))! }()
 
     static func swizzleDealloc() {
         guard !self.isSwizzled else { return }
@@ -345,7 +336,6 @@ extension WKContentRuleList {
     }
 
     @objc
-    func swizzled_dealloc() {
-    }
+    func swizzled_dealloc() { }
 
 }

DuckDuckGoTests/DaxDialogTests.swift

@@ -322,9 +322,8 @@ final class DaxDialog: XCTestCase {
 
     private func makePrivacyInfo(url: URL) -> PrivacyInfo {
         let protectionStatus = ProtectionStatus(unprotectedTemporary: false, enabledFeatures: [], allowlisted: false, denylisted: false)
-        let privacyInfo = PrivacyInfo(url: url,
-                                      parentEntity: entityProvider.entity(forHost: url.host!),
-                                      protectionStatus: protectionStatus)
-        return privacyInfo
+        return PrivacyInfo(url: url,
+                           parentEntity: entityProvider.entity(forHost: url.host!),
+                           protectionStatus: protectionStatus)
     }
 }

DuckDuckGoTests/NetworkProtectionStatusViewModelTests.swift

@@ -204,6 +204,6 @@ final class NetworkProtectionStatusViewModelTests: XCTestCase {
             condition()
         }
         let expectation = XCTNSPredicateExpectation(predicate: predicate, object: nil)
-        wait(for: [expectation], timeout: 5)
+        wait(for: [expectation], timeout: 20)
     }
 }