Skip to content

Commit

Permalink
Merge release/0.81.0 into dominik/test-base-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@daxmobile
daxmobile authored Apr 26, 2024
2 parents 447134c + 02c975b commit e57d336
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 24 deletions.
2 changes: 1 addition & 1 deletion Configuration/BuildNumber.xcconfig
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CURRENT_PROJECT_VERSION = 400
CURRENT_PROJECT_VERSION = 401
2 changes: 1 addition & 1 deletion Configuration/Version.xcconfig
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
MARKETING_VERSION = 0.80.0
MARKETING_VERSION = 0.81.0
4 changes: 2 additions & 2 deletions DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import BrowserServicesKit
final class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {

public struct Constants {
public static let embeddedDataETag = "\"a482727f0d20b29eabd1e22fde2d54cf\""
public static let embeddedDataSHA = "993aa84559944a8866e40cebbce02beee2b1597f86b63f998d000d2a0e5d617a"
public static let embeddedDataETag = "\"bb4ba4890f36ae108cd2dfe7599c61b9\""
public static let embeddedDataSHA = "82064eef480ac6adfcfa0c43f369d738f350b17df813ef46be303d34c9d8f838"
}

var embeddedDataEtag: String {
Expand Down
93 changes: 73 additions & 20 deletions DuckDuckGo/ContentBlocker/macos-config.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"readme": "https://github.com/duckduckgo/privacy-configuration",
"version": 1713140318814,
"version": 1714120242935,
"features": {
"adClickAttribution": {
"readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
Expand Down Expand Up @@ -135,6 +135,9 @@
{
"domain": "ksta.de"
},
{
"domain": "larazon.es"
},
{
"domain": "motherdenim.com"
},
Expand Down Expand Up @@ -279,6 +282,18 @@
{
"domain": "condell-ltd.com"
},
{
"domain": "leefgemeenschapzilt.nl"
},
{
"domain": "healthline.com"
},
{
"domain": "sporthoj.com"
},
{
"domain": "www.michelinman.com"
},
{
"domain": "marvel.com"
},
Expand All @@ -290,13 +305,11 @@
"disabledCMPs": [
"generic-cosmetic",
"termsfeed3",
"strato.de",
"healthline-media",
"tarteaucitron.js"
"healthline-media"
]
},
"state": "enabled",
"hash": "0eaff8b64b6d3e8a59879f3b4ab6c0ba"
"hash": "c9424128cbba2b62fdd54ab79f6eccb6"
},
"autofill": {
"exceptions": [
Expand Down Expand Up @@ -1084,6 +1097,10 @@
{
"domain": "web.de",
"reason": "https://github.com/duckduckgo/privacy-configuration/issues/1931"
},
{
"domain": "id.seb.se",
"reason": "https://github.com/duckduckgo/privacy-configuration/issues/2025"
}
],
"webViewDefault": [
Expand Down Expand Up @@ -1111,7 +1128,7 @@
},
"exceptions": [],
"state": "enabled",
"hash": "76976e1ac417949aae8cb1c7c7ca0a60"
"hash": "c52448ca8da413a93de9822cac039920"
},
"dbp": {
"state": "enabled",
Expand Down Expand Up @@ -2843,6 +2860,27 @@
}
]
},
{
"domain": "independent.co.uk",
"rules": [
{
"selector": "#partners",
"type": "hide-empty"
},
{
"selector": "#top-banner-wrapper",
"type": "hide-empty"
},
{
"selector": "[data-mpu1=true]",
"type": "hide-empty"
},
{
"selector": "#stickyFooterRoot",
"type": "hide"
}
]
},
{
"domain": "indiatimes.com",
"rules": [
Expand Down Expand Up @@ -4231,7 +4269,7 @@
]
},
"state": "enabled",
"hash": "c0fa0dfbc6231be31492023b623ac99b"
"hash": "765e789c939c6e3307f576bc698fbb9e"
},
"exceptionHandler": {
"exceptions": [
Expand All @@ -4245,6 +4283,11 @@
"state": "disabled",
"hash": "dc1b4fa301193a03ddcd4bdf7ee3e610"
},
"extendedOnboarding": {
"exceptions": [],
"state": "disabled",
"hash": "728493ef7a1488e4781656d3f9db84aa"
},
"fingerprintingAudio": {
"state": "disabled",
"exceptions": [
Expand Down Expand Up @@ -4884,18 +4927,11 @@
}
},
"toggleReports": {
"state": "enabled",
"rollout": {
"steps": [
{
"percent": 10
}
]
}
"state": "enabled"
}
},
"state": "enabled",
"hash": "b337f9c7cf15e7e4807ef232befaa999"
"hash": "66968d9b69520975185476473cc11824"
},
"privacyPro": {
"state": "enabled",
Expand Down Expand Up @@ -5218,7 +5254,8 @@
{
"rule": "static.adsafeprotected.com/iasPET.1.js",
"domains": [
"corriere.it"
"corriere.it",
"independent.co.uk"
]
},
{
Expand Down Expand Up @@ -5958,6 +5995,12 @@
"sbs.com.au"
]
},
{
"rule": "https://googleads.g.doubleclick.net/ads/preferences/naioptout",
"domains": [
"zojirushi.com"
]
},
{
"rule": "www3.doubleclick.net",
"domains": [
Expand Down Expand Up @@ -6886,6 +6929,7 @@
{
"rule": "a.klaviyo.com/media/js/onsite/onsite.js",
"domains": [
"bonescoffee.com",
"tanglefree.com"
]
},
Expand All @@ -6894,7 +6938,8 @@
"domains": [
"andieswim.com",
"footweartruth.com",
"kmail-lists.com"
"kmail-lists.com",
"usafacts.org"
]
}
]
Expand Down Expand Up @@ -7107,7 +7152,8 @@
{
"rule": "npttech.com/advertising.js",
"domains": [
"blick.ch"
"blick.ch",
"independent.co.uk"
]
}
]
Expand Down Expand Up @@ -7192,6 +7238,7 @@
"abc.net.au",
"emol.com",
"oufc.co.uk",
"the-afc.com",
"theposh.com"
]
}
Expand All @@ -7210,6 +7257,12 @@
"domains": [
"hgtv.com"
]
},
{
"rule": "https://cdn.optimizely.com/js/271989291.js",
"domains": [
"my.zipcar.com"
]
}
]
},
Expand Down Expand Up @@ -8195,7 +8248,7 @@
"domain": "sundancecatalog.com"
}
],
"hash": "2d627140b59bca8b8edbc236e79cd46e"
"hash": "8f6b1176f9bc6e6c1105122d52a89d5d"
},
"trackingCookies1p": {
"settings": {
Expand Down

0 comments on commit e57d336

Please sign in to comment.