Update supported Xcode version to 16.0

.github/workflows/build_notarized.yml

@@ -71,7 +71,7 @@ jobs:
 
     name: Export Notarized App
 
-    runs-on: macos-14-xlarge
+    runs-on: macos-15-xlarge
 
     outputs:
       app-version: ${{ steps.set-outputs.outputs.app-version }}
@@ -230,7 +230,7 @@ jobs:
     needs: export-notarized-app
     if: ${{ github.event.inputs.create-dmg == true || inputs.create-dmg == true }}
 
-    runs-on: macos-14
+    runs-on: macos-15
 
     env:
       app-version: ${{ needs.export-notarized-app.outputs.app-version }}

.github/workflows/bump_internal_release.yml

@@ -26,7 +26,7 @@ jobs:
 
     # This doesn't need Xcode, so could technically run on Ubuntu, but find_asana_release_task.sh
     # uses BSD-specific `date` syntax, that doesn't work with GNU `date` (available on Linux).
-    runs-on: macos-14
+    runs-on: macos-15
     timeout-minutes: 10
 
     outputs:
@@ -151,7 +151,7 @@ jobs:
     name: Increment Build Number
 
     needs: [ validate_input_conditions, run_tests ]
-    runs-on: macos-14-xlarge
+    runs-on: macos-15-xlarge
     timeout-minutes: 10
 
     steps:

.github/workflows/code_freeze.yml

@@ -9,7 +9,7 @@ jobs:
 
     name: Create Release Branch
 
-    runs-on: macos-14-xlarge
+    runs-on: macos-15-xlarge
     timeout-minutes: 10
 
     outputs:
@@ -111,7 +111,7 @@ jobs:
     name: Increment Build Number
 
     needs: [ create_release_branch, run_tests ]
-    runs-on: macos-14-xlarge
+    runs-on: macos-15-xlarge
     timeout-minutes: 10
 
     steps:

.github/workflows/create_variant.yml

@@ -45,7 +45,7 @@ jobs:
       ATB_VARIANT_NAME: ${{ inputs.atb-variant || github.event.inputs.atb-variant }}
       ORIGIN_VARIANT_NAME: ${{ inputs.origin-variant || github.event.inputs.origin-variant }}
 
-    runs-on: macos-14
+    runs-on: macos-15
     timeout-minutes: 15
 
     steps:

.github/workflows/hotfix.yml

@@ -9,7 +9,7 @@ jobs:
 
     name: Create Release Branch
 
-    runs-on: macos-14-xlarge
+    runs-on: macos-15-xlarge
     timeout-minutes: 10
 
     outputs:

.github/workflows/publish_dmg_release.yml

@@ -76,7 +76,7 @@ jobs:
     # or failed (for public releases or hotfixes), because tagging doesn't block publishing the release
     if: always()
 
-    runs-on: macos-14-xlarge
+    runs-on: macos-15-xlarge
     timeout-minutes: 10
 
     steps:

.github/workflows/screen_size.yml

@@ -0,0 +1,29 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Screen Size Tests
+
+# Controls when the action will run. 
+on:
+  workflow_dispatch:
+jobs:
+  screentest:
+    name: UI tests
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        runner: [macos-15-xlarge]
+        include:
+          - xcode-version: "16.0"
+            runner: macos-15-xlarge
+
+    steps:
+      - name: default screen resolution
+        run: system_profiler SPDisplaysDataType | grep Resolution
+
+      - name: change screen resolution
+        run: |
+          "/Library/Application Support/VMware Tools/vmware-resolutionSet" 1080 2160
+
+      - name: new screen resolution
+        run: system_profiler SPDisplaysDataType | grep Resolution

.github/workflows/sync_end_to_end.yml

@@ -34,12 +34,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runner: [macos-13-xlarge, macos-14-xlarge]
+        runner: [macos-13-xlarge, macos-14-xlarge, macos-15-xlarge]
         include:
           - xcode-version: "15.2"
             runner: macos-13-xlarge
           - xcode-version: "15.4"
             runner: macos-14-xlarge
+          - xcode-version: "16.0"
+            runner: macos-15-xlarge
 
     timeout-minutes: 60
 
@@ -100,6 +102,16 @@ jobs:
       with:
         debug: true
 
+    # This first bit is a hack to stop the app building package dependencies that isn't needed by the test runner
+    # Otherwise xcodebuild will attempt building BSK and linking GRDB framework that is incompatible with Xcode 15
+    - name: Build test runner
+      run: |
+        rm -rf LocalPackages
+        rm -rf DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+        git apply dependencies.patch
+        # sed -i '' '/\/\* Begin XCSwiftPackageProductDependency section \*\//,/\/\* End XCSwiftPackageProductDependency section \*\//d' DuckDuckGo.xcodeproj/project.pbxproj
+        # sed -i '' '/\/\* Begin XCRemoteSwiftPackageReference section \*\//,/\/\* End XCRemoteSwiftPackageReference section \*\//d' DuckDuckGo.xcodeproj/project.pbxproj
+
     - name: Build Sync e2e tests
       run: |
         set -o pipefail && xcodebuild build-for-testing \

.github/workflows/tag_release.yml

@@ -55,7 +55,7 @@ jobs:
 
     # This doesn't need Xcode, so could technically run on Ubuntu, but actions that add comments and tasks
     # in Asana use BSD-specific sed syntax, that doesn't work with GNU sed (available on Linux).
-    runs-on: macos-14
+    runs-on: macos-15
 
     env:
       asana-task-url: ${{ github.event.inputs.asana-task-url || inputs.asana-task-url }}

.github/workflows/ui_tests.yml

@@ -38,12 +38,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runner: [macos-13-xlarge, macos-14-xlarge]
+        runner: [macos-13-xlarge, macos-14-xlarge, macos-15-xlarge]
         include:
           - xcode-version: "15.2"
             runner: macos-13-xlarge
           - xcode-version: "15.4"
             runner: macos-14-xlarge
+          - xcode-version: "16"
+            runner: macos-15-xlarge
 
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.runner }}
@@ -52,6 +54,20 @@ jobs:
     timeout-minutes: 120
 
     steps:
+    - name: Install screenresolution
+      run: brew install screenresolution
+
+    - name: List available resolution
+      run: |
+        screenresolution list
+
+    - name: change screen resolution
+      run: screenresolution set 1920x1080x32@60
+
+    - name: Get New Screen Resolution
+      run: |
+        screenresolution get || echo "Screen resolution data not available"
+
     - name: Register SSH key for certificates repository access
       uses: webfactory/[email protected]
       with:
@@ -167,4 +183,4 @@ jobs:
         asana-pat: ${{ secrets.ASANA_ACCESS_TOKEN }}
         asana-project: ${{ vars.MACOS_APP_DEVELOPMENT_ASANA_PROJECT_ID }}
         asana-task-name: GH Workflow Failure - UI Tests
-        asana-task-description: The UI Tests workflow has failed. See https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+        asana-task-description: The UI Tests workflow has failed. See https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

.xcode-version

@@ -1 +1 @@
-15.4
+16.0

DuckDuckGo.xcodeproj/project.pbxproj

@@ -2737,6 +2737,7 @@
 		B6F9BDE52B45CD1900677B33 /* ModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F9BDE32B45CD1900677B33 /* ModalView.swift */; };
 		B6FA893F269C424500588ECD /* PrivacyDashboardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6FA893E269C424500588ECD /* PrivacyDashboardViewController.swift */; };
 		B6FA8941269C425400588ECD /* PrivacyDashboardPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6FA8940269C425400588ECD /* PrivacyDashboardPopover.swift */; };
+		BB1AD7232CC94F1D00210797 /* BrowserServicesKit in Frameworks */ = {isa = PBXBuildFile; productRef = EE02D41F2BB460C000DBE6B3 /* BrowserServicesKit */; };
 		BB4339DB2C7F9606005D7ED7 /* PinnedTabsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB4339DA2C7F9606005D7ED7 /* PinnedTabsTests.swift */; };
 		BB470EBB2C5A66D6002EE91D /* BookmarkManagementDetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB470EBA2C5A66D6002EE91D /* BookmarkManagementDetailViewModel.swift */; };
 		BB470EBC2C5A66D6002EE91D /* BookmarkManagementDetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB470EBA2C5A66D6002EE91D /* BookmarkManagementDetailViewModel.swift */; };
@@ -2926,8 +2927,6 @@
 		EA8AE76A279FBDB20078943E /* ClickToLoadTDSTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA8AE769279FBDB20078943E /* ClickToLoadTDSTests.swift */; };
 		EE02D41A2BB4609900DBE6B3 /* UITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE02D4192BB4609900DBE6B3 /* UITests.swift */; };
 		EE02D41C2BB460A600DBE6B3 /* BrowsingHistoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE02D41B2BB460A600DBE6B3 /* BrowsingHistoryTests.swift */; };
-		EE02D4202BB460C000DBE6B3 /* BrowserServicesKit in Frameworks */ = {isa = PBXBuildFile; productRef = EE02D41F2BB460C000DBE6B3 /* BrowserServicesKit */; };
-		EE02D4212BB460FE00DBE6B3 /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA8EDF2624923EC70071C2E8 /* StringExtension.swift */; };
 		EE02D4222BB4611A00DBE6B3 /* TestsURLExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6EC37FB29B83E99001ACE79 /* TestsURLExtension.swift */; };
 		EE0429E02BA31D2F009EB20F /* FindInPageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE0429DF2BA31D2F009EB20F /* FindInPageTests.swift */; };
 		EE098E772C8EDE2C009EBA7F /* AutofillCredentialsImportManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE098E762C8EDE2C009EBA7F /* AutofillCredentialsImportManager.swift */; };
@@ -4998,7 +4997,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EE02D4202BB460C000DBE6B3 /* BrowserServicesKit in Frameworks */,
+				BB1AD7232CC94F1D00210797 /* BrowserServicesKit in Frameworks */,
 				9D9DE57F2C63B64F00D20B15 /* AppKitExtensions in Frameworks */,
 				B64E42872B908501006C1346 /* SnapshotTesting in Frameworks */,
 			);
@@ -12347,7 +12346,6 @@
 				EE02D41A2BB4609900DBE6B3 /* UITests.swift in Sources */,
 				EE0429E02BA31D2F009EB20F /* FindInPageTests.swift in Sources */,
 				BBCD467A2C8643EC004DB483 /* XCUIApplicationExtension.swift in Sources */,
-				EE02D4212BB460FE00DBE6B3 /* StringExtension.swift in Sources */,
 				BBBB65402C77BB9400E69AC6 /* BookmarkSearchTests.swift in Sources */,
 				56A054532C2592CE007D8FAB /* OnboardingUITests.swift in Sources */,
 				EE9D81C32BC57A3700338BE3 /* StateRestorationTests.swift in Sources */,
@@ -14683,8 +14681,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
-				kind = exactVersion;
-				version = 202.3.0;
+				branch = "dominik/xcode-16";
+				kind = branch;
 			};
 		};
 		9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

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

@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "7b78b46340c9981b9774352be08c3c28b3a19011",
-        "version" : "202.3.0"
+        "branch" : "dominik/xcode-16",
+        "revision" : "8fb01fbcaf16035d41f543e74c34c3df011847eb"
       }
     },
     {

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/UI Tests CI.xcscheme

@@ -4,7 +4,7 @@
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "NO">
    </BuildAction>
    <TestAction
       buildConfiguration = "Review"

DuckDuckGo/Windows/View/WindowsManager.swift

@@ -76,7 +76,6 @@ final class WindowsManager {
 
         if let droppingPoint {
             mainWindowController.window?.setFrameOrigin(droppingPoint: droppingPoint)
-
         } else if let sourceWindow = self.findPositioningSourceWindow(for: tabCollectionViewModel?.tabs.first) {
             mainWindowController.window?.setFrameOrigin(cascadedFrom: sourceWindow)
         }

IntegrationTests/Common/TestsURLExtension.swift

@@ -17,7 +17,6 @@
 //
 
 import Foundation
-import Common
 
 // Integration Tests helpers
 extension URL {
@@ -62,4 +61,84 @@ extension URL {
         return url
     }
 
+    private func appendingParameters<QueryParams: Collection>(_ parameters: QueryParams, allowedReservedCharacters: CharacterSet? = nil) -> URL
+    where QueryParams.Element == (key: String, value: String) {
+
+        return parameters.reduce(self) { partialResult, parameter in
+            partialResult.appendingParameter(
+                name: parameter.key,
+                value: parameter.value,
+                allowedReservedCharacters: allowedReservedCharacters
+            )
+        }
+    }
+
+    private func appendingParameter(name: String, value: String, allowedReservedCharacters: CharacterSet? = nil) -> URL {
+        let queryItem = URLQueryItem(percentEncodingName: name,
+                                     value: value,
+                                     withAllowedCharacters: allowedReservedCharacters)
+        return self.appending(percentEncodedQueryItem: queryItem)
+    }
+
+    private func appending(percentEncodedQueryItem: URLQueryItem) -> URL {
+        appending(percentEncodedQueryItems: [percentEncodedQueryItem])
+    }
+
+    private func appending(percentEncodedQueryItems: [URLQueryItem]) -> URL {
+        guard var components = URLComponents(url: self, resolvingAgainstBaseURL: true) else { return self }
+
+        var existingPercentEncodedQueryItems = components.percentEncodedQueryItems ?? [URLQueryItem]()
+        existingPercentEncodedQueryItems.append(contentsOf: percentEncodedQueryItems)
+        components.percentEncodedQueryItems = existingPercentEncodedQueryItems
+
+        return components.url ?? self
+    }
+}
+
+fileprivate extension URLQueryItem {
+
+    init(percentEncodingName name: String, value: String, withAllowedCharacters allowedReservedCharacters: CharacterSet? = nil) {
+        let allowedCharacters: CharacterSet = {
+            if let allowedReservedCharacters = allowedReservedCharacters {
+                return .urlQueryParameterAllowed.union(allowedReservedCharacters)
+            }
+            return .urlQueryParameterAllowed
+        }()
+
+        let percentEncodedName = name.percentEncoded(withAllowedCharacters: allowedCharacters)
+        let percentEncodedValue = value.percentEncoded(withAllowedCharacters: allowedCharacters)
+
+        self.init(name: percentEncodedName, value: percentEncodedValue)
+    }
+
+}
+
+extension StringProtocol {
+
+    fileprivate func percentEncoded(withAllowedCharacters allowedCharacters: CharacterSet) -> String {
+        if let percentEncoded = self.addingPercentEncoding(withAllowedCharacters: allowedCharacters) {
+            return percentEncoded
+        }
+        assertionFailure("Unexpected failure")
+        return components(separatedBy: allowedCharacters.inverted).joined()
+    }
+
+    var utf8data: Data {
+        data(using: .utf8)!
+    }
+}
+
+public extension CharacterSet {
+
+    /**
+     * As per [RFC 3986](https://www.rfc-editor.org/rfc/rfc3986#section-2.2).
+     *
+     * This set contains all reserved characters that are otherwise
+     * included in `CharacterSet.urlQueryAllowed` but still need to be percent-escaped.
+     */
+    static let urlQueryReserved = CharacterSet(charactersIn: ":/?#[]@!$&'()*+,;=")
+
+    static let urlQueryParameterAllowed = CharacterSet.urlQueryAllowed.subtracting(Self.urlQueryReserved)
+    static let urlQueryStringAllowed = CharacterSet(charactersIn: "%+?").union(.urlQueryParameterAllowed)
+
 }

IntegrationTests/Tab/ErrorPageTests.swift

@@ -622,9 +622,12 @@ class ErrorPageTests: XCTestCase {
             eServerQueried.fulfill()
             return .failure(NSError.connectionLost)
         }]
-        let eNavigationFailed2 = tab.$error.compactMap { $0 }.timeout(5).first().promise()
 
+        /// Set content before subscribing to `tab.$error.compactMap { $0 }` to allow
+        /// for error to be nullified first by the call to `setContent`.
         tab.setContent(.url(.test, source: .userEntered(URL.test.absoluteString)))
+        let eNavigationFailed2 = tab.$error.compactMap { $0 }.timeout(5).first().promise()
+
         _=try await eNavigationFailed2.value
         await fulfillment(of: [eServerQueried])
 
@@ -698,9 +701,12 @@ class ErrorPageTests: XCTestCase {
             eServerQueried.fulfill()
             return .failure(NSError.connectionLost)
         }]
-        let eNavigationFailed2 = tab.$error.compactMap { $0 }.timeout(5).first().promise()
 
+        /// Set content before subscribing to `tab.$error.compactMap { $0 }` to allow
+        /// for error to be nullified first by the call to `setContent`.
         tab.setContent(.url(.alternative, source: .userEntered(URL.alternative.absoluteString)))
+        let eNavigationFailed2 = tab.$error.compactMap { $0 }.timeout(5).first().promise()
+
         _=try await eNavigationFailed2.value
         await fulfillment(of: [eServerQueried])