Fixes for Xcode16 (#2907)

Task/Issue URL: https://app.asana.com/0/1199230911884351/1207655348648728/f BSK PR: duckduckgo/BrowserServicesKit#864
duckduckgo · Jul 4, 2024 · c83ac79 · c83ac79
1 parent 0a0ea91
commit c83ac79
Show file tree

Hide file tree

Showing 39 changed files with 988 additions and 406 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 ## User settings
 xcuserdata/
+.vscode/
 default.profraw
 
 ## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)

diff --git a/Configuration/App/DuckDuckGo.xcconfig b/Configuration/App/DuckDuckGo.xcconfig
@@ -34,7 +34,7 @@ PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
 PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = MacOS Browser
 PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = MacOS Browser Product Review
 
-GCC_PREPROCESSOR_DEFINITIONS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION=1 SWIFT_OBJC_INTERFACE_HEADER_NAME=$(SWIFT_OBJC_INTERFACE_HEADER_NAME)
+GCC_PREPROCESSOR_DEFINITIONS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION=1 SWIFT_OBJC_INTERFACE_HEADER_NAME=$(SWIFT_OBJC_INTERFACE_HEADER_NAME) uint64_t="unsigned long long" _UINT64_T=1
 GCC_PREPROCESSOR_DEFINITIONS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION=1 DEBUG=1 CI=1 SWIFT_OBJC_INTERFACE_HEADER_NAME=$(SWIFT_OBJC_INTERFACE_HEADER_NAME) $(inherited)
 GCC_PREPROCESSOR_DEFINITIONS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION=1 DEBUG=1 SWIFT_OBJC_INTERFACE_HEADER_NAME=$(SWIFT_OBJC_INTERFACE_HEADER_NAME) $(inherited)
 GCC_PREPROCESSOR_DEFINITIONS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION=1 REVIEW=1 SWIFT_OBJC_INTERFACE_HEADER_NAME=$(SWIFT_OBJC_INTERFACE_HEADER_NAME) $(inherited)

diff --git a/Configuration/Tests/IntegrationTests.xcconfig b/Configuration/Tests/IntegrationTests.xcconfig
@@ -23,5 +23,6 @@ INFOPLIST_FILE = IntegrationTests/Info.plist
 PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.Integration-Tests
 
 SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/IntegrationTests/Common/IntegrationTestsBridging.h
+GCC_PREPROCESSOR_DEFINITIONS[arch=*][sdk=*] = uint64_t="unsigned long long" _UINT64_T=1 $(inherited)
 
 TEST_HOST=$(BUILT_PRODUCTS_DIR)/DuckDuckGo.app/Contents/MacOS/DuckDuckGo
diff --git a/Configuration/Tests/UnitTests.xcconfig b/Configuration/Tests/UnitTests.xcconfig
@@ -23,5 +23,6 @@ INFOPLIST_FILE = UnitTests/Info.plist
 PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.macos.browser.DuckDuckGoTests
 
 SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/UnitTests/Common/TestsBridging.h
+GCC_PREPROCESSOR_DEFINITIONS[arch=*][sdk=*] = uint64_t="unsigned long long" _UINT64_T=1 $(inherited)
 
 TEST_HOST=$(BUILT_PRODUCTS_DIR)/DuckDuckGo.app/Contents/MacOS/DuckDuckGo
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "683424378092d5ca3c57df50d5676cf8c7d2d83c",
-        "version" : "164.2.2"
+        "revision" : "28dd48c5aca37c46402e2a14f7c47aad3877b3aa",
+        "version" : "164.3.0"
       }
     },
     {
@@ -75,10 +75,10 @@
     {
       "identity" : "lottie-spm",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/airbnb/lottie-spm.git",
+      "location" : "https://github.com/airbnb/lottie-spm",
       "state" : {
-        "revision" : "3bd43e12d6fb54654366a61f7cfaca787318b8ce",
-        "version" : "4.4.1"
+        "revision" : "1d29eccc24cc8b75bff9f6804155112c0ffc9605",
+        "version" : "4.4.3"
       }
     },
     {

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/sandbox-test-tool.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/sandbox-test-tool.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1530"
-   version = "1.8">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES"

diff --git a/DuckDuckGo/Bookmarks/View/BookmarkListViewController.swift b/DuckDuckGo/Bookmarks/View/BookmarkListViewController.swift
@@ -672,43 +672,41 @@ extension BookmarkListPopover: BookmarkListViewControllerDelegate {
 }
 
 #if DEBUG
-private let previewEmptyState = false
-@available(macOS 14.0, *)
-#Preview(traits: .fixedLayout(width: BookmarkListViewController.preferredContentSize.width, height: BookmarkListViewController.preferredContentSize.height)) { {
-
-    let vc = BookmarkListViewController(bookmarkManager: {
-        let bkman = LocalBookmarkManager(bookmarkStore: BookmarkStoreMock(bookmarks: previewEmptyState ? [] : [
-            BookmarkFolder(id: "1", title: "Folder 1", children: [
-                BookmarkFolder(id: "2", title: "Nested Folder", children: [
-                    Bookmark(id: "b1", url: URL.duckDuckGo.absoluteString, title: "DuckDuckGo", isFavorite: false, parentFolderUUID: "2")
-                ])
-            ]),
-            BookmarkFolder(id: "3", title: "Another Folder", children: [
-                BookmarkFolder(id: "4", title: "Nested Folder", children: [
-                    BookmarkFolder(id: "5", title: "Another Nested Folder", children: [
-                        Bookmark(id: "b2", url: URL.duckDuckGo.absoluteString, title: "DuckDuckGo", isFavorite: false, parentFolderUUID: "5")
-                    ])
+// swiftlint:disable:next identifier_name
+func _mockPreviewBookmarkManager(previewEmptyState: Bool) -> BookmarkManager {
+    let bkman = LocalBookmarkManager(bookmarkStore: BookmarkStoreMock(bookmarks: previewEmptyState ? [] : [
+        BookmarkFolder(id: "1", title: "Folder 1", children: [
+            BookmarkFolder(id: "2", title: "Nested Folder", children: [
+                Bookmark(id: "b1", url: URL.duckDuckGo.absoluteString, title: "DuckDuckGo", isFavorite: false, parentFolderUUID: "2")
+            ])
+        ]),
+        BookmarkFolder(id: "3", title: "Another Folder", children: [
+            BookmarkFolder(id: "4", title: "Nested Folder", children: [
+                BookmarkFolder(id: "5", title: "Another Nested Folder", children: [
+                    Bookmark(id: "b2", url: URL.duckDuckGo.absoluteString, title: "DuckDuckGo", isFavorite: false, parentFolderUUID: "5")
                 ])
-            ]),
-            Bookmark(id: "b3", url: URL.duckDuckGo.absoluteString, title: "Bookmark 1", isFavorite: false, parentFolderUUID: ""),
-            Bookmark(id: "b4", url: URL.duckDuckGo.absoluteString, title: "Bookmark 2", isFavorite: false, parentFolderUUID: ""),
-            Bookmark(id: "b5", url: URL.duckDuckGo.absoluteString, title: "DuckDuckGo", isFavorite: false, parentFolderUUID: "")
-        ]))
-        bkman.loadBookmarks()
-        customAssertionFailure = { _, _, _ in }
-
-        return bkman
-    }())
-
-    var c: AnyCancellable!
-    c = vc.publisher(for: \.view.window).sink { window in
-        window?.titlebarAppearsTransparent = true
-        window?.titleVisibility = .hidden
-        window?.styleMask = []
-        withExtendedLifetime(c) {}
-    }
+            ])
+        ]),
+        Bookmark(id: "b3", url: URL.duckDuckGo.absoluteString, title: "Bookmark 1", isFavorite: false, parentFolderUUID: ""),
+        Bookmark(id: "b4", url: URL.duckDuckGo.absoluteString, title: "Bookmark 2", isFavorite: false, parentFolderUUID: ""),
+        Bookmark(id: "b5", url: URL.duckDuckGo.absoluteString, title: "DuckDuckGo", isFavorite: false, parentFolderUUID: "")
+    ]))
+    bkman.loadBookmarks()
+    customAssertionFailure = { _, _, _ in }
+
+    return bkman
+}
 
-    return vc
+@available(macOS 14.0, *)
+#Preview("Test Bookmark data",
+         traits: BookmarkListViewController.preferredContentSize.fixedLayout) {
+    BookmarkListViewController(bookmarkManager: _mockPreviewBookmarkManager(previewEmptyState: false))
+        ._preview_hidingWindowControlsOnAppear()
+}
 
-}() }
+@available(macOS 14.0, *)
+#Preview("Empty Scope", traits: BookmarkListViewController.preferredContentSize.fixedLayout) {
+    BookmarkListViewController(bookmarkManager: _mockPreviewBookmarkManager(previewEmptyState: true))
+        ._preview_hidingWindowControlsOnAppear()
+}
 #endif
diff --git a/DuckDuckGo/Bookmarks/View/BookmarkManagementSidebarViewController.swift b/DuckDuckGo/Bookmarks/View/BookmarkManagementSidebarViewController.swift
@@ -372,7 +372,7 @@ extension BookmarkManagementSidebarViewController: FolderMenuItemSelectors {
 #if DEBUG
 private let previewSize = NSSize(width: 400, height: 660)
 @available(macOS 14.0, *)
-#Preview(traits: .fixedLayout(width: previewSize.width, height: previewSize.height)) { {
+#Preview(traits: previewSize.fixedLayout) { {
 
     let vc = BookmarkManagementSidebarViewController(bookmarkManager: {
         let bkman = LocalBookmarkManager(bookmarkStore: BookmarkStoreMock(bookmarks: [

diff --git a/DuckDuckGo/Bookmarks/View/BookmarkManagementSplitViewController.swift b/DuckDuckGo/Bookmarks/View/BookmarkManagementSplitViewController.swift
@@ -86,7 +86,7 @@ extension BookmarkManagementSplitViewController: BookmarkManagementDetailViewCon
 #if DEBUG
 private let previewSize = NSSize(width: 700, height: 660)
 @available(macOS 14.0, *)
-#Preview(traits: .fixedLayout(width: previewSize.width, height: previewSize.height)) { {
+#Preview(traits: previewSize.fixedLayout) { {
 
     let vc = BookmarkManagementSplitViewController(bookmarkManager: {
         let bkman = LocalBookmarkManager(bookmarkStore: BookmarkStoreMock(bookmarks: [

diff --git a/DuckDuckGo/Common/Extensions/NSSizeExtension.swift b/DuckDuckGo/Common/Extensions/NSSizeExtension.swift
@@ -32,3 +32,13 @@ extension NSSize {
     }
 
 }
+
+extension CGSize {
+    /// #Preview helper to convert CGSize to Preview Traits
+    @available(macOS 14.0, *)
+    var fixedLayout: PreviewTrait<Preview.ViewTraits> {
+        MainActor.assumeIsolated {
+            .fixedLayout(width: width, height: height)
+        }
+    }
+}
diff --git a/DuckDuckGo/Common/Extensions/NSViewControllerExtension.swift b/DuckDuckGo/Common/Extensions/NSViewControllerExtension.swift
@@ -98,4 +98,30 @@ extension NSViewController {
         closure()
         CATransaction.commit()
     }
+
+    /// #Preview helper to hide Window controls on View Controller appearance
+    func _preview_hidingWindowControlsOnAppear() -> Self { // swiftlint:disable:this identifier_name
+        Preview_ViewControllerWindowObserver().attach(to: self)
+        return self
+    }
+
+}
+
+/// #Preview helper to hide Window controls on View Controller appearance
+final class Preview_ViewControllerWindowObserver: NSObject {
+    func attach(to viewController: NSViewController) {
+        // Start observing the view.window property
+        viewController.addObserver(self, forKeyPath: #keyPath(NSViewController.view.window), options: [.initial, .new], context: nil)
+        viewController.onDeinit {
+            withExtendedLifetime(self) {}
+        }
+    }
+
+    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) {
+        guard let window = change?[.newKey] as? NSWindow else { return }
+
+        window.titlebarAppearsTransparent = true
+        window.titleVisibility = .hidden
+        window.styleMask = []
+    }
 }