Merge branch 'hotfix/7.146.1'

# By Michal Smaga (1) and Sam Symons (1) # Via GitHub * hotfix/7.146.1: Release 7.146.1-0 (#3626) Use WKHTTPCookieStoreWrapper to better control cookie store concurrency (#3625) # Conflicts: # Configuration/Version.xcconfig # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved # DuckDuckGo/Settings.bundle/Root.plist
duckduckgo · Nov 27, 2024 · fe7c8fc · fe7c8fc
2 parents 9b5ad36 + 4a0b389
commit fe7c8fc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -11248,7 +11248,7 @@
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 211.1.2;
+				version = 211.1.3;
 			};
 		};
 		9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

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" : "deacf613553334f35053a2092d4e062e4775544c",
-        "version" : "211.1.2"
+        "revision" : "f83b1f5ebd328bc2447d1a3793149bb21037d685",
+        "version" : "211.1.3"
       }
     },
     {
@@ -138,7 +138,7 @@
     {
       "identity" : "swift-argument-parser",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-argument-parser",
+      "location" : "https://github.com/apple/swift-argument-parser.git",
       "state" : {
         "revision" : "0fbc8848e389af3bb55c182bc19ca9d5dc2f255b",
         "version" : "1.4.0"

diff --git a/DuckDuckGo/AppDelegate.swift b/DuckDuckGo/AppDelegate.swift
@@ -456,7 +456,7 @@ import os.log
                 return nil
             }
 
-            return WKWebsiteDataStore.current().httpCookieStore
+            return WKHTTPCookieStoreWrapper(store: WKWebsiteDataStore.current().httpCookieStore)
         }, eventMapping: SubscriptionCookieManageEventPixelMapping())
 
 
@@ -665,7 +665,7 @@ import os.log
             }
         }
 
-        Task { @MainActor in
+        Task {
             await subscriptionCookieManager.refreshSubscriptionCookie()
         }