From 47af92640a5258de79878c5c5f0dd14c20278531 Mon Sep 17 00:00:00 2001 From: Bartek Waresiak Date: Wed, 22 Nov 2023 09:01:38 +0100 Subject: [PATCH 1/4] Update version number --- Configuration/Version.xcconfig | 2 +- DuckDuckGo/Settings.bundle/Root.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig index 773b0e1646..71b21c82cd 100644 --- a/Configuration/Version.xcconfig +++ b/Configuration/Version.xcconfig @@ -1 +1 @@ -MARKETING_VERSION = 7.97.0 +MARKETING_VERSION = 7.98.0 diff --git a/DuckDuckGo/Settings.bundle/Root.plist b/DuckDuckGo/Settings.bundle/Root.plist index 52e3696d8c..8b140d6b84 100644 --- a/DuckDuckGo/Settings.bundle/Root.plist +++ b/DuckDuckGo/Settings.bundle/Root.plist @@ -6,7 +6,7 @@ DefaultValue - 7.97.0 + 7.98.0 Key version Title From 9211d997b9e47c683f5a9be17dbd6cbf356cf90c Mon Sep 17 00:00:00 2001 From: Bartek Waresiak Date: Wed, 22 Nov 2023 09:01:48 +0100 Subject: [PATCH 2/4] Update build number --- DuckDuckGo.xcodeproj/project.pbxproj | 42 ++++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 41659805c7..6e9a784388 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -7802,7 +7802,7 @@ CODE_SIGN_ENTITLEMENTS = PacketTunnelProvider/PacketTunnelProvider.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = HKE973VLUW; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -7839,7 +7839,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -7931,7 +7931,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = ShareExtension/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -7958,7 +7958,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -8104,7 +8104,7 @@ CODE_SIGN_ENTITLEMENTS = DuckDuckGo/DuckDuckGo.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; @@ -8128,7 +8128,7 @@ CODE_SIGN_ENTITLEMENTS = DuckDuckGo/DuckDuckGo.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; INFOPLIST_FILE = DuckDuckGo/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -8192,7 +8192,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = NO; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = Widgets/Info.plist; @@ -8227,7 +8227,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; @@ -8261,7 +8261,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = OpenAction/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -8291,7 +8291,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -8577,7 +8577,7 @@ CODE_SIGN_ENTITLEMENTS = DuckDuckGo/DuckDuckGoAlpha.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; @@ -8603,7 +8603,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -8635,7 +8635,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -8672,7 +8672,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; @@ -8708,7 +8708,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -8743,11 +8743,11 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 0; + DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Core/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -8921,11 +8921,11 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 0; + DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Core/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -8954,10 +8954,10 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 0; + DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Core/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; From 4bd774795c5204ba7ac165074c6d58165d4ca0da Mon Sep 17 00:00:00 2001 From: Bartek Waresiak Date: Wed, 22 Nov 2023 09:01:49 +0100 Subject: [PATCH 3/4] Update embedded files --- .../AppPrivacyConfigurationDataProvider.swift | 4 +- Core/ios-config.json | 275 ++++++++++++++++-- 2 files changed, 246 insertions(+), 33 deletions(-) diff --git a/Core/AppPrivacyConfigurationDataProvider.swift b/Core/AppPrivacyConfigurationDataProvider.swift index 4e4e1e6202..c984d0206f 100644 --- 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 = "\"71b1b5499f333348df4f9bc52b74185f\"" - public static let embeddedDataSHA = "a5b30cf79e5efc40fec6fb28491a7484822041d927a6e2d8c9c7ccd3bd236c61" + public static let embeddedDataETag = "\"b8a321aec612923a53b958fbdbfa541e\"" + public static let embeddedDataSHA = "af271d73da0863e678670fb0d9cf4f8269ddb7e584599bfb57d5a370961dbc4b" } public var embeddedDataEtag: String { diff --git a/Core/ios-config.json b/Core/ios-config.json index ce6aeae32a..3283af4e90 100644 --- a/Core/ios-config.json +++ b/Core/ios-config.json @@ -1,6 +1,6 @@ { "readme": "https://github.com/duckduckgo/privacy-configuration", - "version": 1699875322077, + "version": 1700585688784, "features": { "adClickAttribution": { "readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection", @@ -242,6 +242,9 @@ { "domain": "capital.fr" }, + { + "domain": "metro.co.uk" + }, { "domain": "earth.google.com" }, @@ -261,13 +264,10 @@ ] }, "state": "enabled", - "hash": "4719cb6c793d13a9ac81c329f4d206c8" + "hash": "9ab9e1acdb6a8617c77109acc1e3943c" }, "autofill": { "exceptions": [ - { - "domain": "containerstore.com" - }, { "domain": "roll20.net" } @@ -312,7 +312,7 @@ } } }, - "hash": "3d95a9b3c8112148eda0ad09b1002b53" + "hash": "bd604dcd1f7bb584185f0c1cb94a5771" }, "clickToLoad": { "exceptions": [ @@ -1642,6 +1642,14 @@ "selector": ".ad-slot", "type": "closest-empty" }, + { + "selector": "#ad-top", + "type": "hide-empty" + }, + { + "selector": "#ad-wrap", + "type": "hide-empty" + }, { "selector": ".ad-wrap", "type": "closest-empty" @@ -1734,6 +1742,10 @@ "selector": "[data-ad]", "type": "hide-empty" }, + { + "selector": ".instream_ad", + "type": "hide-empty" + }, { "selector": ".adthrive", "type": "hide-empty" @@ -2359,9 +2371,46 @@ { "domain": "foxnews.com", "rules": [ + { + "type": "disable-default" + }, { "selector": ".vendor-unit", "type": "hide-empty" + }, + { + "selector": ".pre-content", + "type": "hide-empty" + }, + { + "selector": "[class*='rr-ad-']", + "type": "hide-empty" + }, + { + "selector": ".ad-h-250", + "type": "hide-empty" + }, + { + "selector": ".sticky-pre-header", + "type": "hide-empty" + }, + { + "selector": ".adhesion-ad", + "type": "hide-empty" + }, + { + "selector": ".sticky-pre-header-inner", + "type": "hide-empty" + }, + { + "selector": ".site-header", + "type": "modify-style", + "values": [ + { + "property": "min-height", + "value": "50px" + } + ] } ] }, @@ -2902,6 +2951,28 @@ } ] }, + { + "domain": "paypal.com", + "rules": [ + { + "selector": "#gslFrame", + "type": "hide" + } + ] + }, + { + "domain": "petapixel.com", + "rules": [ + { + "selector": ".banners", + "type": "hide-empty" + }, + { + "selector": "#ppvideoadvertisement", + "type": "closest-empty" + } + ] + }, { "domain": "peterboroughtoday.co.uk", "rules": [ @@ -3183,6 +3254,15 @@ } ] }, + { + "domain": "takealot.com", + "rules": [ + { + "selector": "[class*='ad-slot_']", + "type": "override" + } + ] + }, { "domain": "target.com", "rules": [ @@ -3245,6 +3325,15 @@ } ] }, + { + "domain": "thewordfinder.com", + "rules": [ + { + "selector": "[id*='adngin']", + "type": "closest-empty" + } + ] + }, { "domain": "thingiverse.com", "rules": [ @@ -3254,6 +3343,15 @@ } ] }, + { + "domain": "tinybeans.com", + "rules": [ + { + "selector": ".tb-ad", + "type": "hide-empty" + } + ] + }, { "domain": "tripadvisor.ca", "rules": [ @@ -3489,10 +3587,6 @@ { "selector": "[data-content='Advertisement']", "type": "hide-empty" - }, - { - "selector": "[id*='default']", - "type": "hide-empty" } ] }, @@ -3610,7 +3704,7 @@ ] }, "state": "enabled", - "hash": "15184cba961aadf588965f6caf070306" + "hash": "c747ff47f18924f7ddde7cea3874e3bc" }, "exceptionHandler": { "exceptions": [ @@ -3930,6 +4024,9 @@ "gpc": { "state": "enabled", "exceptions": [ + { + "domain": "abcnews.go.com" + }, { "domain": "allegiantair.com" }, @@ -3954,6 +4051,9 @@ { "domain": "verizon.com" }, + { + "domain": "chime.com" + }, { "domain": "earth.google.com" }, @@ -3965,6 +4065,9 @@ }, { "domain": "sundancecatalog.com" + }, + { + "domain": "oreillyauto.com" } ], "settings": { @@ -3976,7 +4079,7 @@ "privacy-test-pages.site" ] }, - "hash": "083267b595694bd75cda73218f8811c2" + "hash": "9f8ae6a01924a47b3ca6ce18f001cbd9" }, "harmfulApis": { "settings": { @@ -4173,17 +4276,17 @@ "hash": "698de7b963d7d7942c5c5d1e986bb1b1" }, "networkProtection": { - "state": "disabled", + "state": "enabled", "features": { - "waitlist": { - "state": "disabled" - }, "waitlistBetaActive": { - "state": "disabled" + "state": "enabled" + }, + "waitlist": { + "state": "enabled" } }, "exceptions": [], - "hash": "ba52a36920a4a76343fc3c44d98936f9" + "hash": "7899368978e0f3aaf7eb141a027e4150" }, "newTabContinueSetUp": { "exceptions": [], @@ -4537,12 +4640,38 @@ { "rule": "c.amazon-adsystem.com/aax2/apstag.js", "domains": [ + "4029tv.com", "cnn.com", "corriere.it", "eurogamer.net", + "foxweather.com", + "kcci.com", + "kcra.com", + "ketv.com", + "kmbc.com", + "koat.com", + "koco.com", + "ksbw.com", + "mynbc5.com", "seattletimes.com", + "thesurfersview.com", + "wapt.com", + "wbaltv.com", "wcvb.com", - "wildrivers.lostcoastoutpost.com" + "wdsu.com", + "wesh.com", + "wgal.com", + "wildrivers.lostcoastoutpost.com", + "wisn.com", + "wlky.com", + "wlwt.com", + "wmtw.com", + "wmur.com", + "wpbf.com", + "wtae.com", + "wvtm13.com", + "wxii12.com", + "wyff4.com" ] } ] @@ -4713,16 +4842,6 @@ } ] }, - "cdn.trackjs.com": { - "rules": [ - { - "rule": "cdn.trackjs.com/agent/v3/latest/t.js", - "domains": [ - "delta.com" - ] - } - ] - }, "certona.net": { "rules": [ { @@ -4827,6 +4946,12 @@ "domains": [ "sigalert.com" ] + }, + { + "rule": "dbukjj6eu5tsf.cloudfront.net/assets.sidearmsports.com/common/js/20170825/video.js", + "domains": [ + "" + ] } ] }, @@ -5053,6 +5178,12 @@ "rocketnews24.com" ] }, + { + "rule": "pubads.g.doubleclick.net/ssai/pods/", + "domains": [ + "foxweather.com" + ] + }, { "rule": "securepubads.g.doubleclick.net/tag/js/gpt.js", "domains": [ @@ -5492,7 +5623,13 @@ { "rule": "imasdk.googleapis.com/js/sdkloader/ima3.js", "domains": [ - "nfl.com" + "bloomberg.com", + "games.washingtonpost.com", + "metro.co.uk", + "nfl.com", + "paper-io.com", + "rawstory.com", + "usatoday.com" ] } ] @@ -5512,6 +5649,7 @@ { "rule": "pagead2.googlesyndication.com/pagead/js/adsbygoogle.js", "domains": [ + "drakescans.com", "duden.de", "magicgameworld.com", "rocketnews24.com", @@ -5994,6 +6132,17 @@ } ] }, + "live.primis.tech": { + "rules": [ + { + "rule": "live.primis.tech/live/liveView.php", + "domains": [ + "belfastlive.co.uk", + "cornwalllive.com" + ] + } + ] + }, "livechatinc.com": { "rules": [ { @@ -6151,6 +6300,16 @@ } ] }, + "npttech.com": { + "rules": [ + { + "rule": "npttech.com/advertising.js", + "domains": [ + "blick.ch" + ] + } + ] + }, "nuance.com": { "rules": [ { @@ -6447,6 +6606,16 @@ } ] }, + "protection-widget.route.com": { + "rules": [ + { + "rule": "protection-widget.route.com/protect.core.js", + "domains": [ + "littleunicorn.com" + ] + } + ] + }, "pubmatic.com": { "rules": [ { @@ -6701,6 +6870,16 @@ } ] }, + "taboola.com": { + "rules": [ + { + "rule": "cdn.taboola.com/libtrc/tipranks-tipranks/loader.js", + "domains": [ + "tipranks.com" + ] + } + ] + }, "tealiumiq.com": { "rules": [ { @@ -6764,6 +6943,22 @@ "domains": [ "" ] + }, + { + "rule": "tags.tiqcdn.com/utag/", + "domains": [ + "" + ] + } + ] + }, + "trackjs.com": { + "rules": [ + { + "rule": "cdn.trackjs.com/agent/v3/latest/t.js", + "domains": [ + "delta.com" + ] } ] }, @@ -7089,7 +7284,7 @@ "domain": "sundancecatalog.com" } ], - "hash": "65670bfba426ac832fe6bb2082c432c8" + "hash": "f5e54d051c76c97e2ebaf3014037d10a" }, "trackingCookies1p": { "settings": { @@ -7264,6 +7459,24 @@ "state": "disabled", "hash": "728493ef7a1488e4781656d3f9db84aa" }, + "windowsStartupBoost": { + "exceptions": [ + { + "domain": "earth.google.com" + }, + { + "domain": "iscorp.com" + }, + { + "domain": "marvel.com" + }, + { + "domain": "sundancecatalog.com" + } + ], + "state": "disabled", + "hash": "5e792dd491428702bc0104240fbce0ce" + }, "windowsWaitlist": { "exceptions": [], "state": "enabled", From 9d745277650134749d93e33f561ceeb8a4e894d8 Mon Sep 17 00:00:00 2001 From: Bartek Waresiak Date: Wed, 22 Nov 2023 09:04:45 +0100 Subject: [PATCH 4/4] Update release notes --- fastlane/metadata/default/release_notes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/fastlane/metadata/default/release_notes.txt b/fastlane/metadata/default/release_notes.txt index 4942898476..318421afc6 100644 --- a/fastlane/metadata/default/release_notes.txt +++ b/fastlane/metadata/default/release_notes.txt @@ -1,3 +1,4 @@ +We fixed a rare issue that caused text selection in the address bar to not work as expected. Bug fixes and other improvements. Join our fully distributed team and help raise the standard of trust online! https://duckduckgo.com/hiring