Merge branch 'main' into anh/pir/child-to-parent-broker

# Conflicts: # LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/UIMapper.swift # LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/MapperToUITests.swift
duckduckgo · Jan 14, 2025 · e7098de · e7098de
2 parents 44350a3 + 38b485e
commit e7098de
Show file tree

Hide file tree

Showing 16 changed files with 242 additions and 35 deletions.
diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 340
+CURRENT_PROJECT_VERSION = 341
diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 1.121.0
+MARKETING_VERSION = 1.122.0
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -15366,7 +15366,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 224.6.0;
+				version = 224.6.1;
 			};
 		};
 		9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,17 +32,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "20316b105d8874e10cf544a9c97e97237441ae01",
-        "version" : "224.6.0"
+        "revision" : "58efae813cae03d71af87aab863af5c25a3a8a6e",
+        "version" : "224.6.1"
       }
     },
     {
       "identity" : "content-scope-scripts",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/content-scope-scripts",
       "state" : {
-        "revision" : "06d244c4e0951ef16217c46f23c4865c5f98dd5c",
-        "version" : "7.4.0"
+        "revision" : "0502ed7de4130bd8705daebaca9aeb20d3e62d15",
+        "version" : "7.5.0"
       }
     },
     {
@@ -104,8 +104,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/privacy-dashboard",
       "state" : {
-        "revision" : "2e2baf7d31c7d8e158a58bc1cb79498c1c727fd2",
-        "version" : "7.5.0"
+        "revision" : "bea4d750913ef82c10cd06e791686501c8e648e4",
+        "version" : "7.6.0"
       }
     },
     {

diff --git a/DuckDuckGo/Autoconsent/autoconsent-bundle.js b/DuckDuckGo/Autoconsent/autoconsent-bundle.js
diff --git a/DuckDuckGo/Common/Extensions/WKWebViewExtension.swift b/DuckDuckGo/Common/Extensions/WKWebViewExtension.swift
@@ -403,6 +403,9 @@ extension WKWebView {
 
     // prevent exception if private API keys go missing
     open override func value(forUndefinedKey key: String) -> Any? {
+        if key == #keyPath(serverTrust) {
+            return self.serverTrust
+        }
         assertionFailure("valueForUndefinedKey: \(key)")
         return nil
     }

diff --git a/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift b/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift
@@ -22,8 +22,8 @@ import BrowserServicesKit
 final class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"a6ade6ceb34c6fa3e77b0904c91edfb8\""
-        public static let embeddedDataSHA = "66c4cfc84a16ab9b60fc34c59fb2876c1e3cd76d40e04b5b3b14825a1ded2771"
+        public static let embeddedDataETag = "\"3243e6f75825c955dfbae28fd65a5942\""
+        public static let embeddedDataSHA = "6526ec6fd0221136fcd393cbe21bf89dfe9fbaad28c634d8fdda277a7aa8a9db"
     }
 
     var embeddedDataEtag: String {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		CURRENT_PROJECT_VERSION = 340
		CURRENT_PROJECT_VERSION = 341
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		MARKETING_VERSION = 1.121.0
		MARKETING_VERSION = 1.122.0