Merge branch 'release/7.145.0'

duckduckgo · Nov 11, 2024 · a18bfbb · a18bfbb
2 parents e6e1ec3 + e8b0c2b
commit a18bfbb
Show file tree

Hide file tree

Showing 6 changed files with 122 additions and 42 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -40,7 +40,7 @@ jobs:
     name: Unit Tests
 
     runs-on: macos-14-xlarge
-    timeout-minutes: 15
+    timeout-minutes: 20
 
     outputs:
       commit_author: ${{ steps.fetch_commit_author.outputs.commit_author }}

diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 7.144.0
+MARKETING_VERSION = 7.145.0
diff --git a/Core/AppPrivacyConfigurationDataProvider.swift b/Core/AppPrivacyConfigurationDataProvider.swift
@@ -23,8 +23,8 @@ import BrowserServicesKit
 final public class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"516f95a16f7a556c58e14ee6f193cc30\""
-        public static let embeddedDataSHA = "87314e1ac02784472a722844a27b443b0387a164ac72afaac00d9a70731fc572"
+        public static let embeddedDataETag = "\"bd1f5490770791f68fa9667d530758a9\""
+        public static let embeddedDataSHA = "86b8c31a53f781d66dbc16eb09578d28149fee6c0e280fc75ddafeed8a4b46ac"
     }
 
     public var embeddedDataEtag: String {

diff --git a/Core/ios-config.json b/Core/ios-config.json
@@ -1,6 +1,6 @@
 {
     "readme": "https://github.com/duckduckgo/privacy-configuration",
-    "version": 1730481067679,
+    "version": 1731320660413,
     "features": {
         "adClickAttribution": {
             "readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
@@ -1357,14 +1357,11 @@
                 {
                     "domain": "flexmls.com"
                 },
-                {
-                    "domain": "centerwellpharmacy.com"
-                },
                 {
                     "domain": "instructure.com"
                 }
             ],
-            "hash": "1cc80acd10d985c950e40c5b876c581b"
+            "hash": "96b2f778bab196aa424e9c859ddea778"
         },
         "contextualOnboarding": {
             "exceptions": [],
@@ -1424,6 +1421,12 @@
                 {
                     "domain": "instructure.com"
                 },
+                {
+                    "domain": "humana.com"
+                },
+                {
+                    "domain": "centerwellpharmacy.com"
+                },
                 {
                     "domain": "marvel.com"
                 },
@@ -1441,7 +1444,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "fce0a9ccd7ae060d25e7debe4d8905fb"
+            "hash": "33c2d56a2a9dd43c88a353d8a57dfa72"
         },
         "customUserAgent": {
             "settings": {
@@ -1802,6 +1805,10 @@
                         "selector": ".top-ad",
                         "type": "hide-empty"
                     },
+                    {
+                        "selector": "#top-ad",
+                        "type": "hide"
+                    },
                     {
                         "selector": "#topAd",
                         "type": "hide-empty"
@@ -1854,6 +1861,10 @@
                         "selector": "#google-one-tap-popup-container",
                         "type": "hide"
                     },
+                    {
+                        "selector": ".google-one-tap__module",
+                        "type": "hide"
+                    },
                     {
                         "selector": ".google-one-tap-modal-div",
                         "type": "hide"
@@ -2165,6 +2176,7 @@
                     "content continues below",
                     "x",
                     "_",
+                    "sponsor message",
                     "sponsored",
                     "sponsorisé",
                     "story continues below advertisement",
@@ -3227,6 +3239,10 @@
                             {
                                 "selector": "[aria-labelledby='promo-header']",
                                 "type": "hide"
+                            },
+                            {
+                                "selector": "div[role='banner']:has(div > a[href='https://support.google.com/a/answer/33864'])",
+                                "type": "hide"
                             }
                         ]
                     },
@@ -4965,7 +4981,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "d8fb8089fcfbd527940703c8e2665966"
+            "hash": "2fa4c7c9bfd50585ee22d6c2d3bd3279"
         },
         "exceptionHandler": {
             "exceptions": [
@@ -5638,10 +5654,13 @@
                 },
                 "userTips": {
                     "state": "enabled"
+                },
+                "enforceRoutes": {
+                    "state": "enabled"
                 }
             },
             "exceptions": [],
-            "hash": "324309d731591edf4174a6e5d11b837c"
+            "hash": "137177ca43449da8ce870fc838b35845"
         },
         "newTabContinueSetUp": {
             "exceptions": [],
@@ -5917,6 +5936,27 @@
             "state": "disabled",
             "hash": "be6751fe0307a7e1b9476f4d8b8d0aaf"
         },
+        "showOnAppLaunch": {
+            "exceptions": [
+                {
+                    "domain": "marvel.com"
+                },
+                {
+                    "domain": "sundancecatalog.com"
+                },
+                {
+                    "domain": "noaprints.com"
+                },
+                {
+                    "domain": "flexmls.com"
+                },
+                {
+                    "domain": "instructure.com"
+                }
+            ],
+            "state": "disabled",
+            "hash": "be6751fe0307a7e1b9476f4d8b8d0aaf"
+        },
         "sslCertificates": {
             "state": "enabled",
             "exceptions": [],
@@ -5927,6 +5967,27 @@
             },
             "hash": "abe9584048f7f8157f71a14e7914cb1c"
         },
+        "swipingTabs": {
+            "exceptions": [
+                {
+                    "domain": "marvel.com"
+                },
+                {
+                    "domain": "sundancecatalog.com"
+                },
+                {
+                    "domain": "noaprints.com"
+                },
+                {
+                    "domain": "flexmls.com"
+                },
+                {
+                    "domain": "instructure.com"
+                }
+            ],
+            "state": "disabled",
+            "hash": "be6751fe0307a7e1b9476f4d8b8d0aaf"
+        },
         "syncPromotion": {
             "state": "enabled",
             "features": {
@@ -6765,6 +6826,12 @@
                                     "homedepot.com",
                                     "sbs.com.au"
                                 ]
+                            },
+                            {
+                                "rule": "sbs.demdex.net",
+                                "domains": [
+                                    "sbs.com.au"
+                                ]
                             }
                         ]
                     },
@@ -6863,6 +6930,12 @@
                                     "wunderground.com"
                                 ]
                             },
+                            {
+                                "rule": "securepubads.g.doubleclick.net/pagead/ima_ppub_config",
+                                "domains": [
+                                    "sbs.com.au"
+                                ]
+                            },
                             {
                                 "rule": "securepubads.g.doubleclick.net/pagead/managed/js/gpt",
                                 "domains": [
@@ -8944,6 +9017,13 @@
                                     "<all>"
                                 ]
                             },
+                            {
+                                "rule": "tags.tiqcdn.com/utag/cbsi/",
+                                "domains": [
+                                    "cbs.com",
+                                    "paramountplus.com"
+                                ]
+                            },
                             {
                                 "rule": "tags.tiqcdn.com/utag/",
                                 "domains": [
@@ -9347,7 +9427,7 @@
                     "domain": "instructure.com"
                 }
             ],
-            "hash": "c28128dee65a2aa7fef1528b73f33c7f"
+            "hash": "b7c276ffe1417313a46c0d13fbc9fcd9"
         },
         "trackingCookies1p": {
             "settings": {