Merge branch 'main' into sabrina/fix_InfoPlist_string

duckduckgo · Feb 26, 2024 · 5b3d9a7 · 5b3d9a7
2 parents f0c30ed + 19c2656
commit 5b3d9a7
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 14 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -13538,7 +13538,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 110.0.1;
+				version = 111.0.2;
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {

diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "483427db845410f10121cf2200f5a940c9bbf70b",
-        "version" : "110.0.1"
+        "revision" : "04c35220aa94bd005171086acccadd677400e7d5",
+        "version" : "111.0.2"
       }
     },
     {

diff --git a/DuckDuckGo/DataImport/Bookmarks/Safari/SafariBookmarksReader.swift b/DuckDuckGo/DataImport/Bookmarks/Safari/SafariBookmarksReader.swift
@@ -49,7 +49,12 @@ final class SafariBookmarksReader {
         let type: OperationType
         let underlyingError: Error?
 
-        var errorType: DataImport.ErrorType { .dataCorrupted }
+        var errorType: DataImport.ErrorType {
+            switch underlyingError {
+            case let error as CocoaError where error.code == .fileReadNoSuchFile: .noData
+            default: .dataCorrupted
+            }
+        }
     }
 
     private let safariBookmarksFileURL: URL

diff --git a/DuckDuckGo/DataImport/View/DataImportView.swift b/DuckDuckGo/DataImport/View/DataImportView.swift
@@ -128,7 +128,7 @@ struct DataImportView: ModalView {
 
                 // if no data to import
                 if model.summary(for: dataType)?.isEmpty == true
-                            || model.error(for: dataType)?.errorType == .noData {
+                    || model.error(for: dataType)?.errorType == .noData {
 
                     DataImportNoDataView(source: model.importSource, dataType: dataType)
                         .padding(.bottom, 24)

diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
@@ -29,7 +29,7 @@ let package = Package(
             targets: ["DataBrokerProtection"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"),
         .package(path: "../PixelKit"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper")

diff --git a/LocalPackages/LoginItems/Package.swift b/LocalPackages/LoginItems/Package.swift
@@ -13,7 +13,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"),
     ],
     targets: [
         .target(

diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -31,7 +31,7 @@ let package = Package(
         .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"),
         .package(path: "../XPCHelper"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../LoginItems")

diff --git a/LocalPackages/PixelKit/Package.swift b/LocalPackages/PixelKit/Package.swift
@@ -20,7 +20,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"),
     ],
     targets: [
         .target(

diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
@@ -12,7 +12,7 @@ let package = Package(
             targets: ["SubscriptionUI"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [

diff --git a/LocalPackages/SwiftUIExtensions/Package.swift b/LocalPackages/SwiftUIExtensions/Package.swift
@@ -11,7 +11,7 @@ let package = Package(
         .library(name: "PreferencesViews", targets: ["PreferencesViews"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"),
     ],
     targets: [
         .target(

diff --git a/LocalPackages/SyncUI/Package.swift b/LocalPackages/SyncUI/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
     ],
     dependencies: [
         .package(path: "../SwiftUIExtensions"),
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"),
     ],
     targets: [
         .target(

diff --git a/LocalPackages/SystemExtensionManager/Package.swift b/LocalPackages/SystemExtensionManager/Package.swift
@@ -16,7 +16,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"),
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.

diff --git a/LocalPackages/XPCHelper/Package.swift b/LocalPackages/XPCHelper/Package.swift
@@ -30,7 +30,7 @@ let package = Package(
         .library(name: "XPCHelper", targets: ["XPCHelper"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "110.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"),
     ],
     targets: [
         .target(