New deployment target set to 11.4 (#1592)

Task/Issue URL: https://app.asana.com/0/0/1204736441183124/f **Description**: This PR adjusts deployment target to macOS 11.4 and removes unnecessary code required for support of older macOS versions.
duckduckgo · Sep 10, 2023 · bb74fca · bb74fca
1 parent d7e5bed
commit bb74fca
Show file tree

Hide file tree

Showing 113 changed files with 296 additions and 1,418 deletions.
diff --git a/Configuration/Common.xcconfig b/Configuration/Common.xcconfig
@@ -26,7 +26,7 @@ GCC_PREPROCESSOR_DEFINITIONS[config=CI][arch=*][sdk=*] = DEBUG=1 CI=1 $(inherite
 GCC_PREPROCESSOR_DEFINITIONS[config=Debug][arch=*][sdk=*] = DEBUG=1 $(inherited)
 GCC_PREPROCESSOR_DEFINITIONS[config=Review][arch=*][sdk=*] = REVIEW=1 $(inherited)
 
-MACOSX_DEPLOYMENT_TARGET = 10.15.4
+MACOSX_DEPLOYMENT_TARGET = 11.4
 
 PRODUCT_MODULE_NAME = $(TARGET_NAME:c99extidentifier)
 

diff --git a/Configuration/Tests/IntegrationTests.xcconfig b/Configuration/Tests/IntegrationTests.xcconfig
@@ -15,7 +15,7 @@
 
 #include "TestsTargetsBase.xcconfig"
 
-MACOSX_DEPLOYMENT_TARGET = 11.1
+MACOSX_DEPLOYMENT_TARGET = 11.4
 
 FEATURE_FLAGS = FEEDBACK NETWORK_PROTECTION
 

diff --git a/Configuration/UITests/UITests.xcconfig b/Configuration/UITests/UITests.xcconfig
@@ -20,7 +20,7 @@ CODE_SIGN_IDENTITY[config=CI][sdk=macosx*] =
 
 DEAD_CODE_STRIPPING = YES
 
-MACOSX_DEPLOYMENT_TARGET = 11.3
+MACOSX_DEPLOYMENT_TARGET = 11.4
 
 INFOPLIST_FILE = UI Tests/Info.plist
 PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.UI-Tests

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
diff --git a/DuckDuckGo/AppDelegate/AppDelegate.swift b/DuckDuckGo/AppDelegate/AppDelegate.swift
@@ -206,15 +206,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
         UserDefaultsWrapper<Any>.clearRemovedKeys()
 
 #if NETWORK_PROTECTION
-        if #available(macOS 11.4, *) {
-            /// Once we drop support for macOS versions below 11.4, we can turn `NetworkProtectionAppEvents`
-            /// into a property.  Right now it's easier to avoid it since we can't place macOS version conditions on properties.
-            ///
-            /// In any case this is not going to happen on a high frequency and should not affect performance in any relevant
-            /// way.
-            NetworkProtectionAppEvents().applicationDidFinishLaunching()
-        }
-
+        NetworkProtectionAppEvents().applicationDidFinishLaunching()
         UNUserNotificationCenter.current().delegate = self
 #endif
 
@@ -232,14 +224,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
             // Do nothing when code fetching fails, as the app will try again later
         }
 
-        if #available(macOS 11.4, *) {
-            /// Once we drop support for macOS versions below 11.4, we can turn `NetworkProtectionAppEvents`
-            /// into a property.  Right now it's easier to avoid it since we can't place macOS version conditions on properties.
-            ///
-            /// In any case this is not going to happen on a high frequency and should not affect performance in any relevant
-            /// way.
-            NetworkProtectionAppEvents().applicationDidBecomeActive()
-        }
+        NetworkProtectionAppEvents().applicationDidBecomeActive()
 #endif
     }
 

diff --git a/DuckDuckGo/Autoconsent/AutoconsentUserScript.swift b/DuckDuckGo/Autoconsent/AutoconsentUserScript.swift
@@ -31,7 +31,6 @@ protocol UserScriptWithAutoconsent: UserScript {
     var delegate: AutoconsentUserScriptDelegate? { get set }
 }
 
-@available(macOS 11, *)
 final class AutoconsentUserScript: NSObject, WKScriptMessageHandlerWithReply, UserScriptWithAutoconsent {
     var injectionTime: WKUserScriptInjectionTime { .atDocumentStart }
     var forMainFrameOnly: Bool { false }
@@ -79,7 +78,6 @@ final class AutoconsentUserScript: NSObject, WKScriptMessageHandlerWithReply, Us
     }
 }
 
-@available(macOS 11, *)
 extension AutoconsentUserScript {
     enum MessageName: String, CaseIterable {
         case `init`
@@ -157,7 +155,6 @@ extension AutoconsentUserScript {
     }
 }
 
-@available(macOS 11, *)
 extension AutoconsentUserScript {
     @MainActor
     func handleMessage(replyHandler: @escaping (Any?, String?) -> Void,

diff --git a/DuckDuckGo/Autoconsent/UI/CookieConsentUserPermissionView.swift b/DuckDuckGo/Autoconsent/UI/CookieConsentUserPermissionView.swift
@@ -102,14 +102,10 @@ struct CookieConsentUserPermissionView_Previews: PreviewProvider {
     static var previews: some View {
         let result: (Bool) -> Void = { _ in }
 
-        if #available(macOS 11.0, *) {
-            CookieConsentUserPermissionView(sketchAnimationModel: CookieConsentAnimationMock(), type: .site, result: result).preferredColorScheme(.dark)
-                .padding()
-            CookieConsentUserPermissionView(sketchAnimationModel: CookieConsentAnimationMock(), type: .site, result: result).preferredColorScheme(.light)
-                .padding()
-        } else {
-            CookieConsentUserPermissionView(sketchAnimationModel: CookieConsentAnimationMock(), type: .site, result: result)
-        }
+        CookieConsentUserPermissionView(sketchAnimationModel: CookieConsentAnimationMock(), type: .site, result: result).preferredColorScheme(.dark)
+            .padding()
+        CookieConsentUserPermissionView(sketchAnimationModel: CookieConsentAnimationMock(), type: .site, result: result).preferredColorScheme(.light)
+            .padding()
     }
 }
 

diff --git a/DuckDuckGo/Bookmarks/Extensions/NSPopUpButtonExtension.swift b/DuckDuckGo/Bookmarks/Extensions/NSPopUpButtonExtension.swift
@@ -58,4 +58,12 @@ extension NSPopUpButton {
         selectItem(withTitle: title)
     }
 
+    @discardableResult
+    func addItem(withTitle title: String, representedObject: Any?) -> NSMenuItem {
+        self.addItem(withTitle: title)
+        let item = self.item(at: self.numberOfItems - 1)!
+        item.representedObject = representedObject
+        return item
+    }
+
 }
diff --git a/DuckDuckGo/Bookmarks/View/BookmarkListViewController.swift b/DuckDuckGo/Bookmarks/View/BookmarkListViewController.swift
@@ -77,7 +77,6 @@ final class BookmarkListViewController: NSViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        view.subscribeForAppApperanceUpdates()?.store(in: &cancellables)
         preferredContentSize = CGSize(width: 420, height: 500)
 
         outlineView.register(BookmarkOutlineViewCell.nib, forIdentifier: BookmarkOutlineViewCell.identifier)

diff --git a/DuckDuckGo/Bookmarks/View/BookmarkPopoverViewController.swift b/DuckDuckGo/Bookmarks/View/BookmarkPopoverViewController.swift
@@ -47,12 +47,9 @@ final class BookmarkPopoverViewController: NSViewController {
         }
     }
 
-    private var appearanceCancellable: AnyCancellable?
-
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        appearanceCancellable = view.subscribeForAppApperanceUpdates()
         textField.delegate = self
 
         folderPickerSelectionCancellable = folderPickerPopUpButton.selectionPublisher.dropFirst().sink { [weak self] index in

diff --git a/DuckDuckGo/Bookmarks/View/BookmarkTableRowView.swift b/DuckDuckGo/Bookmarks/View/BookmarkTableRowView.swift
@@ -110,9 +110,6 @@ final class BookmarkTableRowView: NSTableRowView {
     }
 
     override var interiorBackgroundStyle: NSView.BackgroundStyle {
-        if #unavailable(macOS 11.0) {
-            return .light
-        }
         return .normal
     }
 

diff --git a/DuckDuckGo/Bookmarks/View/RoundedSelectionRowView.swift b/DuckDuckGo/Bookmarks/View/RoundedSelectionRowView.swift
@@ -70,9 +70,6 @@ final class RoundedSelectionRowView: NSTableRowView {
     }
 
     override var interiorBackgroundStyle: NSView.BackgroundStyle {
-        if #unavailable(macOS 11.0) {
-            return .light
-        }
         return .normal
     }
 

diff --git a/DuckDuckGo/Bridging.h b/DuckDuckGo/Bridging.h
@@ -7,13 +7,9 @@
 
 #import "WKWebView+Private.h"
 #import "NSException+Catch.h"
-#import "WKNavigationAction+Private.h"
-
 #import "WKGeolocationProvider.h"
 
 #ifndef APPSTORE
-#import "_WKDownload.h"
-#import "WKProcessPool+Private.h"
 #import "BWEncryption.h"
 #import "PFMoveApplication.h"
 #endif
diff --git a/DuckDuckGo/Common/Extensions/NSAppearanceExtension.swift b/DuckDuckGo/Common/Extensions/NSAppearanceExtension.swift
@@ -20,13 +20,6 @@ import Cocoa
 
 extension NSAppearance {
     static func withAppAppearance(_ closure: () -> Void) {
-        if #available(macOS 11.0, *) {
-            NSApp.effectiveAppearance.performAsCurrentDrawingAppearance(closure)
-        } else {
-            let previousAppearance = NSAppearance.current
-            NSAppearance.current = NSApp.effectiveAppearance
-            closure()
-            NSAppearance.current = previousAppearance
-        }
+        NSApp.effectiveAppearance.performAsCurrentDrawingAppearance(closure)
     }
 }
diff --git a/DuckDuckGo/Common/Extensions/NSOpenPanelExtensions.swift b/DuckDuckGo/Common/Extensions/NSOpenPanelExtensions.swift
@@ -38,12 +38,7 @@ extension NSOpenPanel {
 
         panel.directoryURL = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent("Desktop")
         panel.canChooseFiles = true
-        if #available(macOS 11.0, *) {
-            panel.allowedContentTypes = [UniformTypeIdentifiers.UTType.init(filenameExtension: allowedExtension)].compactMap { $0 }
-        } else {
-            panel.allowedFileTypes = [allowedExtension]
-        }
-
+        panel.allowedContentTypes = UTType(filenameExtension: allowedExtension).map { [$0] } ?? []
         panel.canChooseDirectories = false
 
         return panel

diff --git a/DuckDuckGo/Common/Extensions/NSViewExtension.swift b/DuckDuckGo/Common/Extensions/NSViewExtension.swift
@@ -64,7 +64,7 @@ extension NSView {
 
     func applyDropShadow() {
         wantsLayer = true
-        layer?.shadowColor = NSColor.controlShadowColor.cgColor
+        layer?.shadowColor = NSColor.black.withAlphaComponent(0.2).cgColor
         layer?.shadowOpacity = 1.0
         layer?.masksToBounds = false
     }
@@ -146,30 +146,4 @@ extension NSView {
         layer?.cornerRadius = 3.0
     }
 
-    // MARK: - Appearance updates
-
-    /**
-     * Sets current app appearance to the view and subscribes for subsequent updates.
-     *
-     * This is needed on Catalina for views displayed in popovers that have custom, opaque backgrounds.
-     * Presentation in popover overrides view appearance to `.vibrantLight` or `.vibrantDark`, which
-     * makes subviews such as `NSTextField` and `NSButton` draw their backgrounds with vibrancy effect,
-     * which in turn removes opaque background locally. Calling this method on the top-level view seems
-     * to be solving the issue.
-     *
-     * See [](https://app.asana.com/0/1177771139624306/1202121324275642/f) for an example screenshot.
-     */
-    func subscribeForAppApperanceUpdates() -> AnyCancellable? {
-        if #available(macOS 11.0, *) {
-            return nil
-        }
-
-        appearance = NSApp.effectiveAppearance
-
-        return NSApp
-            .publisher(for: \.effectiveAppearance)
-            .map { $0 as NSAppearance? }
-            .assign(to: \.appearance, onWeaklyHeld: self)
-    }
-
 }
diff --git a/DuckDuckGo/Common/Extensions/StringExtension.swift b/DuckDuckGo/Common/Extensions/StringExtension.swift
@@ -18,6 +18,7 @@
 
 import Foundation
 import BrowserServicesKit
+import UniformTypeIdentifiers
 
 extension String {
 
@@ -73,13 +74,17 @@ extension String {
     static func uniqueFilename(for fileType: UTType? = nil) -> String {
         let fileName = UUID().uuidString
 
-        if let ext = fileType?.fileExtension {
+        if let ext = fileType?.preferredFilenameExtension {
             return fileName.appending("." + ext)
         }
 
         return fileName
     }
 
+    var pathExtension: String {
+        (self as NSString).pathExtension
+    }
+
     // MARK: - Mutating
 
     @inlinable mutating func prepend(_ string: String) {

diff --git a/DuckDuckGo/Common/Extensions/WKUserContentControllerExtension.swift b/DuckDuckGo/Common/Extensions/WKUserContentControllerExtension.swift
@@ -25,27 +25,19 @@ extension WKUserContentController {
 
     func addHandler(_ userScript: UserScript) {
         for messageName in userScript.messageNames {
-            if #available(macOS 11.0, *) {
-                let contentWorld: WKContentWorld = userScript.getContentWorld()
-                if let handlerWithReply = userScript as? WKScriptMessageHandlerWithReply {
-                    addScriptMessageHandler(handlerWithReply, contentWorld: contentWorld, name: messageName)
-                } else {
-                    add(userScript, contentWorld: contentWorld, name: messageName)
-                }
+            let contentWorld: WKContentWorld = userScript.getContentWorld()
+            if let handlerWithReply = userScript as? WKScriptMessageHandlerWithReply {
+                addScriptMessageHandler(handlerWithReply, contentWorld: contentWorld, name: messageName)
             } else {
-                add(userScript, name: messageName)
+                add(userScript, contentWorld: contentWorld, name: messageName)
             }
         }
     }
 
     func removeHandler(_ userScript: UserScript) {
         userScript.messageNames.forEach {
-            if #available(macOS 11.0, *) {
-                let contentWorld: WKContentWorld = userScript.getContentWorld()
-                removeScriptMessageHandler(forName: $0, contentWorld: contentWorld)
-            } else {
-                removeScriptMessageHandler(forName: $0)
-            }
+            let contentWorld: WKContentWorld = userScript.getContentWorld()
+            removeScriptMessageHandler(forName: $0, contentWorld: contentWorld)
         }
     }
 

diff --git a/DuckDuckGo/Common/Extensions/WKWebView+Private.h b/DuckDuckGo/Common/Extensions/WKWebView+Private.h
@@ -17,7 +17,6 @@
 //  limitations under the License.
 //
 #import <WebKit/WebKit.h>
-#import "_WKDownload.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -27,19 +26,20 @@ typedef NS_OPTIONS(NSUInteger, _WKMediaCaptureStateDeprecated) {
     _WKMediaCaptureStateDeprecatedActiveCamera = 1 << 1,
     _WKMediaCaptureStateDeprecatedMutedMicrophone = 1 << 2,
     _WKMediaCaptureStateDeprecatedMutedCamera = 1 << 3,
-};
+} API_AVAILABLE(macos(10.13), ios(11.0));
+
 typedef NS_OPTIONS(NSUInteger, _WKMediaMutedState) {
     _WKMediaNoneMuted = 0,
     _WKMediaAudioMuted = 1 << 0,
     _WKMediaCaptureDevicesMuted = 1 << 1,
     _WKMediaScreenCaptureMuted = 1 << 2,
-};
+} API_AVAILABLE(macos(10.13), ios(11.0));
 
 typedef NS_OPTIONS(NSUInteger, _WKCaptureDevices) {
     _WKCaptureDeviceMicrophone = 1 << 0,
     _WKCaptureDeviceCamera = 1 << 1,
     _WKCaptureDeviceDisplay = 1 << 2,
-} API_AVAILABLE(macosx(10.3));
+} API_AVAILABLE(macos(10.13), ios(11.0));
 
 typedef NS_OPTIONS(NSUInteger, _WKFindOptions) {
     _WKFindOptionsCaseInsensitive = 1 << 0,
@@ -59,22 +59,12 @@ typedef NS_OPTIONS(NSUInteger, _WKFindOptions) {
 - (void)_restoreFromSessionStateData:(NSData *)data;
 - (NSData * _Nullable)_sessionStateData;
 
-- (void)createWebArchiveDataWithCompletionHandler:(void (^)(NSData * _Nullable, NSError * _Nullable))completionHandler;
-- (void)createPDFWithConfiguration:(id _Nullable)pdfConfiguration completionHandler:(void (^)(NSData * _Nullable pdfDocumentData, NSError * _Nullable error))completionHandler;
-
-@property (nonatomic, readonly) _WKMediaCaptureStateDeprecated _mediaCaptureState;
+@property (nonatomic, readonly) _WKMediaCaptureStateDeprecated _mediaCaptureState API_AVAILABLE(macos(10.15), ios(13.0));
 
-- (void)setMicrophoneCaptureState:(WKMediaCaptureState)state completionHandler:(void (^)(void))completionHandler API_AVAILABLE(macos(12.0), ios(15.0));
-- (void)setCameraCaptureState:(WKMediaCaptureState)state completionHandler:(void (^)(void))completionHandler API_AVAILABLE(macos(12.0), ios(15.0));
-- (void)_stopMediaCapture;
+- (void)_stopMediaCapture API_AVAILABLE(macos(10.15.4), ios(13.4));
 - (void)_stopAllMediaPlayback;
-- (_WKMediaMutedState)_mediaMutedState;
-- (void)_setPageMuted:(_WKMediaMutedState)mutedState;
-
-- (NSPrintOperation *)_printOperationWithPrintInfo:(NSPrintInfo *)printInfo;
-- (NSPrintOperation * _Nullable)_printOperationWithPrintInfo:(NSPrintInfo *)printInfo forFrame:(id)frame;
-
-- (NSView *)_fullScreenPlaceholderView;
+- (_WKMediaMutedState)_mediaMutedState API_AVAILABLE(macos(11.0), ios(14.0));;
+- (void)_setPageMuted:(_WKMediaMutedState)mutedState API_AVAILABLE(macos(10.13), ios(11.0));
 
 @end
 

diff --git a/DuckDuckGo/Common/Extensions/WKWebViewConfigurationExtensions.swift b/DuckDuckGo/Common/Extensions/WKWebViewConfigurationExtensions.swift
@@ -50,9 +50,6 @@ extension WKWebViewConfiguration {
 
         self.userContentController = userContentController
         self.processPool.geolocationProvider = GeolocationProvider(processPool: self.processPool)
-#if !APPSTORE
-        self.processPool.setDownloadDelegateIfNeeded(using: LegacyWebKitDownloadDelegate.init)
-#endif
      }
 
 }