From acff9b265e5b1ee184ecbba336ec00390f87dd57 Mon Sep 17 00:00:00 2001 From: Anka Date: Fri, 20 Dec 2024 14:35:43 +0000 Subject: [PATCH 1/4] Update embedded files --- .../AppPrivacyConfigurationDataProvider.swift | 4 +- DuckDuckGo/ContentBlocker/macos-config.json | 217 +++--------------- 2 files changed, 28 insertions(+), 193 deletions(-) diff --git a/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift b/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift index f8de3e35b3..fe84d83f16 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 = "\"36cb9b7c85e95d81192f94333083061d\"" - public static let embeddedDataSHA = "4657ec2c7665722c768b344f4b731591bc5ba2a840cf75275f56b8e6c94b7f1c" + public static let embeddedDataETag = "\"5647056efac55d6e77db078ae1011be3\"" + public static let embeddedDataSHA = "c7c7a010322f1c0a27f5122820f67d1203a986482b1c63172db4b17d6f341acb" } var embeddedDataEtag: String { diff --git a/DuckDuckGo/ContentBlocker/macos-config.json b/DuckDuckGo/ContentBlocker/macos-config.json index f9704d7085..d17c6f36b0 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": 1734119755860, + "version": 1734691010823, "features": { "adAttributionReporting": { "state": "disabled", @@ -431,189 +431,6 @@ { "domain": "manoloblahnik.com" }, - { - "domain": "skyscanner.net" - }, - { - "domain": "skyscanner.ru" - }, - { - "domain": "skyscanner.fi" - }, - { - "domain": "skyscanner.no" - }, - { - "domain": "skyscanner.nl" - }, - { - "domain": "skyscanner.ro" - }, - { - "domain": "skyscanner.com.ni" - }, - { - "domain": "skyscanner.at" - }, - { - "domain": "skyscanner.com.sg" - }, - { - "domain": "skyscanner.es" - }, - { - "domain": "skyscanner.co.nz" - }, - { - "domain": "skyscanner.com.sa" - }, - { - "domain": "skyscanner.com.bo" - }, - { - "domain": "skyscanner.com.br" - }, - { - "domain": "skyscanner.mx" - }, - { - "domain": "skyscanner.it" - }, - { - "domain": "skyscanner.ae" - }, - { - "domain": "skyscanner.in" - }, - { - "domain": "skyscanner.com.sv" - }, - { - "domain": "skyscanner.ie" - }, - { - "domain": "skyscanner.co.kr" - }, - { - "domain": "skyscanner.com.pe" - }, - { - "domain": "skyscanner.com.ph" - }, - { - "domain": "skyscanner.com.pa" - }, - { - "domain": "skyscanner.hu" - }, - { - "domain": "skyscanner.com.gt" - }, - { - "domain": "skyscanner.com.co" - }, - { - "domain": "skyscanner.dk" - }, - { - "domain": "skyscanner.co.th" - }, - { - "domain": "skyscanner.com.hn" - }, - { - "domain": "skyscanner.pt" - }, - { - "domain": "skyscanner.tw" - }, - { - "domain": "skyscanner.de" - }, - { - "domain": "skyscanner.com.hk" - }, - { - "domain": "skyscanner.com.tw" - }, - { - "domain": "skyscanner.pl" - }, - { - "domain": "skyscanner.com.tr" - }, - { - "domain": "skyscanner.cz" - }, - { - "domain": "skyscanner.com" - }, - { - "domain": "skyscanner.cr" - }, - { - "domain": "skyscanner.com.py" - }, - { - "domain": "skyscanner.cl" - }, - { - "domain": "skyscanner.com.ua" - }, - { - "domain": "skyscanner.com.do" - }, - { - "domain": "skyscanner.kr" - }, - { - "domain": "skyscanner.co.id" - }, - { - "domain": "skyscanner.ch" - }, - { - "domain": "skyscanner.gg" - }, - { - "domain": "skyscanner.ca" - }, - { - "domain": "skyscanner.com.uy" - }, - { - "domain": "skyscanner.com.ec" - }, - { - "domain": "skyscanner.co.il" - }, - { - "domain": "skyscanner.co.in" - }, - { - "domain": "skyscanner.com.vn" - }, - { - "domain": "skyscanner.se" - }, - { - "domain": "skyscanner.com.ar" - }, - { - "domain": "skyscanner.com.au" - }, - { - "domain": "skyscanner.fr" - }, - { - "domain": "skyscanner.jp" - }, - { - "domain": "skyscanner.com.my" - }, - { - "domain": "skyscanner.com.mx" - }, { "domain": "outlet46.de" }, @@ -818,6 +635,9 @@ { "domain": "wetransfer.com" }, + { + "domain": "collectcheckout.com" + }, { "domain": "marvel.com" }, @@ -849,7 +669,7 @@ "state": "enabled" } }, - "hash": "a692694898bc7afebeb0747632e834b3" + "hash": "6e8df7847b365381429db33fe036be43" }, "autofillBreakageReporter": { "state": "disabled", @@ -3989,6 +3809,14 @@ } ] }, + { + "domain": "kamus.net", + "rules": [ + { + "type": "disable-default" + } + ] + }, { "domain": "kbb.com", "rules": [ @@ -5499,7 +5327,7 @@ ] }, "state": "enabled", - "hash": "ea1628129c6ec998632537745212250e" + "hash": "f03105d9a96fe2bc97460562f6f61ee2" }, "exceptionHandler": { "exceptions": [ @@ -5944,6 +5772,9 @@ { "domain": "madewell.com" }, + { + "domain": "visible.com" + }, { "domain": "marvel.com" }, @@ -5969,7 +5800,7 @@ "privacy-test-pages.site" ] }, - "hash": "cc0c0adfc06919bb973a7636b59b2430" + "hash": "7bac9629b3b6d7cbe2e473c1273d31ee" }, "harmfulApis": { "settings": { @@ -6155,12 +5986,16 @@ }, "maliciousSiteProtection": { "state": "internal", - "exceptions": [], + "exceptions": [ + { + "domain": "broken.third-party.site" + } + ], "settings": { "hashPrefixUpdateFrequency": 20, "filterSetUpdateFrequency": 720 }, - "hash": "ca9942379aea7619f878337a2debdee8" + "hash": "8ceb05ed570765a54738b77c1deb1f64" }, "marketplaceAdPostback": { "state": "disabled", @@ -6435,7 +6270,7 @@ "minSupportedVersion": "1.113.0" }, "setAccessTokenCookieForSubscriptionDomains": { - "state": "enabled", + "state": "disabled", "rollout": { "steps": [ { @@ -6449,7 +6284,7 @@ "minSupportedVersion": "1.116.0" } }, - "hash": "f6cdbdef4f1a09ae58e791e1d1a6bfa4" + "hash": "142f357c4bc40a01f99d03566c58cb8b" }, "privacyProtectionsPopup": { "state": "disabled", From fe57bc979b0d5585203f9bf639bb4bc2e9e70ad9 Mon Sep 17 00:00:00 2001 From: Anka Date: Fri, 20 Dec 2024 14:35:43 +0000 Subject: [PATCH 2/4] Set marketing version to 1.120.0 --- Configuration/Version.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig index 0764e0c6a7..e87b0e32ed 100644 --- a/Configuration/Version.xcconfig +++ b/Configuration/Version.xcconfig @@ -1 +1 @@ -MARKETING_VERSION = 1.119.0 +MARKETING_VERSION = 1.120.0 From b0791a6c34a53064f54305a5a5bb58aa82c95dbc Mon Sep 17 00:00:00 2001 From: Anka Date: Fri, 20 Dec 2024 15:24:47 +0000 Subject: [PATCH 3/4] Bump version to 1.120.0 (333) --- Configuration/BuildNumber.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig index 78ac15dc98..0eb45b7701 100644 --- a/Configuration/BuildNumber.xcconfig +++ b/Configuration/BuildNumber.xcconfig @@ -1 +1 @@ -CURRENT_PROJECT_VERSION = 332 +CURRENT_PROJECT_VERSION = 333 From 4aceb9317646a665162cce3e01eedc221aa9b6ba Mon Sep 17 00:00:00 2001 From: Pete Smith <5278441+aataraxiaa@users.noreply.github.com> Date: Fri, 20 Dec 2024 16:18:03 +0000 Subject: [PATCH 4/4] Bump runner (#3684) Task/Issue URL: Tech Design URL: CC: **Description**: Bump macOS Runner --- .github/workflows/build_appstore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_appstore.yml b/.github/workflows/build_appstore.yml index 24902f58fa..6931896c98 100644 --- a/.github/workflows/build_appstore.yml +++ b/.github/workflows/build_appstore.yml @@ -58,7 +58,7 @@ jobs: name: Make App Store Connect Release - runs-on: macos-14-xlarge + runs-on: macos-15-xlarge env: destination: ${{ github.event.inputs.destination || inputs.destination }}