From 2ef7a02156ad1fc097544b71712db540f3537810 Mon Sep 17 00:00:00 2001 From: Dax the Duck Date: Mon, 29 Jul 2024 13:10:45 +0000 Subject: [PATCH 1/3] Update embedded files --- .../AppPrivacyConfigurationDataProvider.swift | 4 +- DuckDuckGo/ContentBlocker/macos-config.json | 174 ++++++++++++++---- 2 files changed, 142 insertions(+), 36 deletions(-) diff --git a/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift b/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift index 564ce73c49..d3c1c91f4a 100644 --- 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 = "\"bda3cb319ce173dfb9fbb4f0a4a31820\"" - public static let embeddedDataSHA = "5f015578b361c93df32101bc4c9c2454c8b4e033fea544ecdb78d8b6f1080edd" + public static let embeddedDataETag = "\"6403cfec3fc0fdc8bd9d3967c4d93c70\"" + public static let embeddedDataSHA = "331ccf1c2918df4510481778abc742cd88e453fa7366dda45a747920c901f86a" } var embeddedDataEtag: String { diff --git a/DuckDuckGo/ContentBlocker/macos-config.json b/DuckDuckGo/ContentBlocker/macos-config.json index c3a701665a..e129950d98 100644 --- a/DuckDuckGo/ContentBlocker/macos-config.json +++ b/DuckDuckGo/ContentBlocker/macos-config.json @@ -1,6 +1,6 @@ { "readme": "https://github.com/duckduckgo/privacy-configuration", - "version": 1721748106575, + "version": 1722257174026, "features": { "adClickAttribution": { "readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection", @@ -82,6 +82,9 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "settings": { @@ -108,7 +111,7 @@ ] }, "state": "enabled", - "hash": "b9baf40f82353fbfd4e1daa45f7a60e9" + "hash": "4efd0ce3e46f0b52aa919a6f80edcd00" }, "androidBrowserConfig": { "exceptions": [], @@ -323,6 +326,9 @@ { "domain": "harley-davidson.com" }, + { + "domain": "dailymail.co.uk" + }, { "domain": "marvel.com" }, @@ -331,6 +337,9 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "settings": { @@ -342,7 +351,7 @@ ] }, "state": "enabled", - "hash": "568bcdbfe8d7611496de889d20c033fb" + "hash": "16ae53feb54606dee484b0ed4da3e7e8" }, "autofillBreakageReporter": { "state": "disabled", @@ -1050,6 +1059,9 @@ }, { "domain": "tinder.com" + }, + { + "domain": "instructure.com" } ], "settings": { @@ -1068,7 +1080,7 @@ }, "state": "enabled", "minSupportedVersion": "1.93.0", - "hash": "08e30d1e6f6105ec1698b55a0aca317a" + "hash": "242071b6df63a9285e4519b3e29e34c1" }, "clickToPlay": { "exceptions": [ @@ -1080,6 +1092,9 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "settings": { @@ -1092,7 +1107,7 @@ } }, "state": "enabled", - "hash": "4abcb8a33a72b7fe696a343c0dcd85af" + "hash": "daa147e3f277083d492964c68a9f5caf" }, "clientBrandHint": { "exceptions": [], @@ -1131,9 +1146,12 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], - "hash": "ee9d383becfe28d8a5b575b51f5c9d11" + "hash": "42da678c1cc61b0d52986f536e05f416" }, "cookie": { "settings": { @@ -1181,6 +1199,9 @@ { "domain": "news.ti.com" }, + { + "domain": "instructure.com" + }, { "domain": "marvel.com" }, @@ -1189,10 +1210,13 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "state": "disabled", - "hash": "e045fd25b82f8ac2cbd02877153bd9c2" + "hash": "d23565fe73c051c53bff8a40396f705d" }, "customUserAgent": { "settings": { @@ -1245,6 +1269,10 @@ { "domain": "manage.wix.com", "reason": "https://github.com/duckduckgo/privacy-configuration/pull/2166" + }, + { + "domain": "beta.maps.apple.com", + "reason": "Unsupported browser warning" } ], "webViewDefault": [ @@ -1272,7 +1300,7 @@ }, "exceptions": [], "state": "enabled", - "hash": "132d12636968cac6025e986bd8358ce2" + "hash": "93b410d9c0c7c1cb954d3be40b0247f6" }, "dbp": { "state": "enabled", @@ -1393,6 +1421,9 @@ }, { "domain": "wunderground.com" + }, + { + "domain": "instructure.com" } ], "settings": { @@ -4617,7 +4648,7 @@ ] }, "state": "enabled", - "hash": "a27afdd4dfee7a8dcd74a8745d3306ed" + "hash": "4689e9dd3357db39d086b254fb00507f" }, "exceptionHandler": { "exceptions": [ @@ -4629,10 +4660,13 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "state": "disabled", - "hash": "cd2dbf279bf4eb19171c6d79bf5df183" + "hash": "139d551fb343ef36567a2d35e7c4457a" }, "extendedOnboarding": { "exceptions": [], @@ -4653,9 +4687,12 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], - "hash": "d4ffa55e08a4e062a0c0f1a9e1e8275b" + "hash": "a05e98b812061f4362468b51c4951937" }, "fingerprintingBattery": { "exceptions": [ @@ -4670,10 +4707,13 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "state": "disabled", - "hash": "68af061e3b8c78b06a0b8e6667d40aff" + "hash": "0b7239752bdfb9fd3e1eeaff733fe613" }, "fingerprintingCanvas": { "settings": { @@ -4772,10 +4812,13 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "state": "disabled", - "hash": "211fff4a5ceb8e61a12f26f2ff4f1e04" + "hash": "5a29a3dee399844c40b4b759b5fc524c" }, "fingerprintingHardware": { "settings": { @@ -4874,10 +4917,13 @@ }, { "domain": "zoom.us" + }, + { + "domain": "instructure.com" } ], "state": "enabled", - "hash": "df0ff6af6c5ae7c141d275cd75f27ce7" + "hash": "895f01c838574b034e405f4e506ebe94" }, "fingerprintingScreenSize": { "settings": { @@ -4925,10 +4971,13 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "state": "disabled", - "hash": "319faddf90e233710e5a254e25988c87" + "hash": "e316926668f68f7288c1c09c7158834f" }, "fingerprintingTemporaryStorage": { "exceptions": [ @@ -4949,10 +4998,13 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "state": "disabled", - "hash": "bcb9e995c193bccf72622010f87185af" + "hash": "318229ab4611a2cd34b23aae9135122b" }, "googleRejected": { "exceptions": [ @@ -4964,10 +5016,13 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "state": "disabled", - "hash": "cd2dbf279bf4eb19171c6d79bf5df183" + "hash": "139d551fb343ef36567a2d35e7c4457a" }, "gpc": { "state": "enabled", @@ -5025,6 +5080,9 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "settings": { @@ -5036,7 +5094,7 @@ "privacy-test-pages.site" ] }, - "hash": "8d7152a7ac339ca9333a3dbb246a3d76" + "hash": "f1edc5fb05afdac69084326add51da45" }, "harmfulApis": { "settings": { @@ -5146,10 +5204,13 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "state": "disabled", - "hash": "aa8430d25bbd499d1f8bed22caf34943" + "hash": "d12818afbee58693fc60fd0be7cc90db" }, "history": { "state": "disabled", @@ -5176,9 +5237,12 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], - "hash": "bf47b6ce76c34dd70bc0678fa23c7c52" + "hash": "fd20e89d32343cf42c4b7f5101d5b900" }, "incontextSignup": { "exceptions": [], @@ -5223,6 +5287,9 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "settings": { @@ -5233,7 +5300,7 @@ ] }, "state": "enabled", - "hash": "79aac7de322d705ec237c688b7e60d6c" + "hash": "68732c967df2ff5beb2d851378395cfd" }, "networkProtection": { "state": "enabled", @@ -5305,10 +5372,13 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "state": "disabled", - "hash": "5dba15e93b648ef9de8be7ef3b4def33" + "hash": "4977063ee77c043c5ad51e3daeb188ca" }, "performanceMetrics": { "state": "enabled", @@ -5321,9 +5391,12 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], - "hash": "1a1a4652687f25da9f351df157c5e051" + "hash": "94113375ad83c83f79c508e5a6b4d204" }, "phishingDetection": { "state": "internal", @@ -5336,6 +5409,9 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "features": { @@ -5346,7 +5422,7 @@ "state": "internal" } }, - "hash": "2caa9ff12e48c6e51980b2788b242f88" + "hash": "ca33e2c8e25f0502cbf45bedb02dddf4" }, "pluginPointFocusedViewPlugin": { "state": "disabled", @@ -5479,10 +5555,13 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "state": "disabled", - "hash": "3c850040d1c9b3e06841b1491c5d2940" + "hash": "f2d162b61ce76263251dbea36b528cfe" }, "remoteMessaging": { "state": "enabled", @@ -5500,12 +5579,15 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "settings": { "windowInMs": 0 }, - "hash": "38f912d4dc34772ba00e207217eb2e86" + "hash": "d424b3a064dd4abfccbd145270b121cf" }, "runtimeChecks": { "state": "disabled", @@ -5518,10 +5600,13 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "settings": {}, - "hash": "5ff34abb3d8cf7087d3ca570e89cefc2" + "hash": "7dd7a12bfb6c39e9fe94cc24a81c56fc" }, "serviceworkerInitiatedRequests": { "exceptions": [ @@ -5533,10 +5618,13 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "state": "disabled", - "hash": "cd2dbf279bf4eb19171c6d79bf5df183" + "hash": "139d551fb343ef36567a2d35e7c4457a" }, "sslCertificates": { "state": "enabled", @@ -8902,9 +8990,12 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], - "hash": "7430556251f5289f7e70edafd0e4cd0c" + "hash": "2760d1d1407d43cb407a3954b693bbc8" }, "trackingCookies1p": { "settings": { @@ -8922,10 +9013,13 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "state": "disabled", - "hash": "cc77dc124b0b2985b15360217ed313a9" + "hash": "4e5efbd74ddcc8849735bfe590ed0d78" }, "trackingCookies3p": { "settings": { @@ -8940,10 +9034,13 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "state": "disabled", - "hash": "5dba15e93b648ef9de8be7ef3b4def33" + "hash": "4977063ee77c043c5ad51e3daeb188ca" }, "trackingParameters": { "exceptions": [ @@ -8958,6 +9055,9 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "settings": { @@ -8991,7 +9091,7 @@ }, "state": "enabled", "minSupportedVersion": "0.22.3", - "hash": "642e6568ba8e37894d91d68e86258fbf" + "hash": "ae9d3a7642a97199783380b145748b15" }, "userAgentRotation": { "settings": { @@ -9006,10 +9106,13 @@ }, { "domain": "noaprints.com" + }, + { + "domain": "instructure.com" } ], "state": "disabled", - "hash": "5d0a0094113c803aa7c57edffd28e2f9" + "hash": "8e86f07f09dcca5d1f327c31f8da38a6" }, "voiceSearch": { "exceptions": [], @@ -9248,6 +9351,9 @@ }, { "domain": "community.bitwarden.com" + }, + { + "domain": "instructure.com" } ], "state": "enabled", @@ -9292,7 +9398,7 @@ } ] }, - "hash": "a8ea63aef4af72c462736bf28db907b8" + "hash": "5fbe07453e4502170f302049c96f8b1b" }, "webViewBlobDownload": { "exceptions": [], From e51545e36648a43f5b17339090877d49ee133e39 Mon Sep 17 00:00:00 2001 From: Dax the Duck Date: Mon, 29 Jul 2024 13:10:45 +0000 Subject: [PATCH 2/3] Set marketing version to 1.100.0 --- Configuration/Version.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig index 2da8f40737..f74ff7935d 100644 --- a/Configuration/Version.xcconfig +++ b/Configuration/Version.xcconfig @@ -1 +1 @@ -MARKETING_VERSION = 1.99.0 +MARKETING_VERSION = 1.100.0 From c6295d0928c558ca020106e74c5b546a2c105530 Mon Sep 17 00:00:00 2001 From: Dax the Duck Date: Mon, 29 Jul 2024 14:14:44 +0000 Subject: [PATCH 3/3] Bump version to 1.100.0 (235) --- Configuration/BuildNumber.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig index e6436b39e0..67f12d8fe8 100644 --- a/Configuration/BuildNumber.xcconfig +++ b/Configuration/BuildNumber.xcconfig @@ -1 +1 @@ -CURRENT_PROJECT_VERSION = 234 +CURRENT_PROJECT_VERSION = 235