Merge branch 'fcappelli/authv2/adding_v2_classes' into fcappelli/subs…

…cription_oauth_api_v2 # Conflicts: # Package.swift # Sources/Networking/Auth/OAuthService.swift # Sources/Networking/v2/APIRequestV2.swift # Sources/Networking/v2/APIRequestV2Error.swift # Sources/Networking/v2/APIService.swift # Sources/Networking/v2/Extensions/Dictionary+URLQueryItem.swift # Sources/NetworkingTestingUtils/MockAPIService.swift # Sources/Subscription/API/AuthEndpointService.swift # Sources/Subscription/API/SubscriptionAPIService.swift # Sources/Subscription/API/SubscriptionEndpointService.swift # Sources/Subscription/Flows/AppStore/AppStorePurchaseFlow.swift # Sources/Subscription/Flows/Models/SubscriptionOptions.swift # Sources/Subscription/SubscriptionEnvironment.swift # Sources/Subscription/SubscriptionTokenProvider.swift # Sources/SubscriptionTestingUtilities/APIs/APIServiceMock.swift # Sources/SubscriptionTestingUtilities/APIs/SubscriptionEndpointServiceMock.swift # Sources/SubscriptionTestingUtilities/Flows/AppStorePurchaseFlowMock.swift # Sources/SubscriptionTestingUtilities/SubscriptionCookie/SubscriptionCookieManagerMock.swift # Tests/RemoteMessagingTests/Mappers/DefaultRemoteMessagingSurveyURLBuilderTests.swift
duckduckgo · Jan 30, 2025 · 76ba897 · 76ba897
2 parents ecf8c5d + c81c5f8
commit 76ba897
Show file tree

Hide file tree

Showing 89 changed files with 8,729 additions and 648 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/content-scope-scripts",
       "state" : {
-        "revision" : "0ac30560ec969a321caea321f95537120416c323",
-        "version" : "7.7.0"
+        "revision" : "181696656f3627c1b3ca8cda06d54971e03436ef",
+        "version" : "7.10.0"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -56,7 +56,7 @@ let package = Package(
         .package(url: "https://github.com/duckduckgo/TrackerRadarKit.git", exact: "3.0.0"),
         .package(url: "https://github.com/duckduckgo/sync_crypto", exact: "0.4.0"),
         .package(url: "https://github.com/gumob/PunycodeSwift.git", exact: "3.0.0"),
-        .package(url: "https://github.com/duckduckgo/content-scope-scripts", exact: "7.7.0"),
+        .package(url: "https://github.com/duckduckgo/content-scope-scripts", exact: "7.10.0"),
         .package(url: "https://github.com/duckduckgo/privacy-dashboard", exact: "8.1.0"),
         .package(url: "https://github.com/httpswift/swifter.git", exact: "1.5.0"),
         .package(url: "https://github.com/duckduckgo/bloom_cpp.git", exact: "3.0.0"),
@@ -78,7 +78,8 @@ let package = Package(
                 "ContentBlocking",
                 "SecureStorage",
                 "Subscription",
-                "Networking"
+                "Networking",
+                "PixelKit",
             ],
             resources: [
                 .process("ContentBlocking/UserScripts/contentblockerrules.js"),
@@ -428,6 +429,7 @@ let package = Package(
         .target(
             name: "MaliciousSiteProtection",
             dependencies: [
+                "BrowserServicesKit",
                 "Common",
                 "Networking",
                 "PixelKit",
@@ -452,7 +454,8 @@ let package = Package(
             name: "PixelExperimentKit",
             dependencies: [
                 "PixelKit",
-                "BrowserServicesKit"
+                "BrowserServicesKit",
+                "Configuration"
             ],
             resources: [
                 .process("Resources")
@@ -719,7 +722,8 @@ let package = Package(
         .testTarget(
             name: "PixelExperimentKitTests",
             dependencies: [
-                "PixelExperimentKit"
+                "PixelExperimentKit",
+                "Configuration"
             ]
         ),
         .testTarget(

diff --git a/Sources/BrowserServicesKit/DataImport/Bookmarks/BookmarksImportSummary.swift b/Sources/BrowserServicesKit/DataImport/Bookmarks/BookmarksImportSummary.swift
@@ -0,0 +1,38 @@
+//
+//  BookmarksImportSummary.swift
+//
+//  Copyright © 2025 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+
+public struct BookmarksImportSummary: Equatable {
+    public var successful: Int
+    public var duplicates: Int
+    public var failed: Int
+
+    public init(successful: Int, duplicates: Int, failed: Int) {
+        self.successful = successful
+        self.duplicates = duplicates
+        self.failed = failed
+    }
+
+    public static func += (left: inout BookmarksImportSummary, right: BookmarksImportSummary) {
+        left.successful += right.successful
+        left.duplicates += right.duplicates
+        left.failed += right.failed
+    }
+
+}