Skip to content

Commit

Permalink
Merge release/1.86.0 into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@daxmobile
daxmobile authored Apr 29, 2024
2 parents 79d648d + a951d2f commit c290fc6
Show file tree
Hide file tree
Showing 4 changed files with 84 additions and 13 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 = 176
CURRENT_PROJECT_VERSION = 177
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 = 1.85.0
MARKETING_VERSION = 1.86.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 = "\"7cf7b71adb62c3cbcbf8b84c61a0004d\""
public static let embeddedDataSHA = "20e9b59e7e60ccc9ae52853935ebe3d74227234fcf8b46da5a66cff3adc7e6c7"
public static let embeddedDataETag = "\"0cbf39995c17cfe7455c0ceff1b5d8cc\""
public static let embeddedDataSHA = "4e5495e24a27eba09553c335fc566bc694111e957faac6512093b76d3f585f71"
}

var embeddedDataEtag: String {
Expand Down
89 changes: 80 additions & 9 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": 1713542334045,
"version": 1714411110624,
"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 @@ -288,6 +291,9 @@
{
"domain": "sporthoj.com"
},
{
"domain": "www.michelinman.com"
},
{
"domain": "marvel.com"
},
Expand All @@ -299,12 +305,11 @@
"disabledCMPs": [
"generic-cosmetic",
"termsfeed3",
"healthline-media",
"tarteaucitron.js"
]
},
"state": "enabled",
"hash": "f35e24cf85485b441cb9a76146e77e17"
"hash": "bca76e26434e161140776de92c03cb5f"
},
"autofill": {
"exceptions": [
Expand Down Expand Up @@ -1092,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 @@ -1119,7 +1128,7 @@
},
"exceptions": [],
"state": "enabled",
"hash": "76976e1ac417949aae8cb1c7c7ca0a60"
"hash": "c52448ca8da413a93de9822cac039920"
},
"dbp": {
"state": "enabled",
Expand Down Expand Up @@ -4256,11 +4265,20 @@
"type": "override"
}
]
},
{
"domain": "wideopencountry.com",
"rules": [
{
"selector": ".entry-ad",
"type": "hide-empty"
}
]
}
]
},
"state": "enabled",
"hash": "765e789c939c6e3307f576bc698fbb9e"
"hash": "cebfdc8b9e9f34d7e407f430850e7d70"
},
"exceptionHandler": {
"exceptions": [
Expand All @@ -4274,6 +4292,11 @@
"state": "disabled",
"hash": "dc1b4fa301193a03ddcd4bdf7ee3e610"
},
"extendedOnboarding": {
"exceptions": [],
"state": "disabled",
"hash": "728493ef7a1488e4781656d3f9db84aa"
},
"fingerprintingAudio": {
"state": "disabled",
"exceptions": [
Expand Down Expand Up @@ -5981,6 +6004,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 @@ -6683,6 +6712,16 @@
}
]
},
"grow.me": {
"rules": [
{
"rule": "grow.me/main.js",
"domains": [
"budgetbytes.com"
]
}
]
},
"gstatic.com": {
"rules": [
{
Expand Down Expand Up @@ -6909,6 +6948,7 @@
{
"rule": "a.klaviyo.com/media/js/onsite/onsite.js",
"domains": [
"bonescoffee.com",
"tanglefree.com"
]
},
Expand Down Expand Up @@ -7121,7 +7161,8 @@
{
"rule": "connect.nosto.com/script/shopify/nosto.js",
"domains": [
"oneill.com"
"oneill.com",
"thefryecompany.com"
]
}
]
Expand Down Expand Up @@ -7217,6 +7258,7 @@
"abc.net.au",
"emol.com",
"oufc.co.uk",
"the-afc.com",
"theposh.com"
]
}
Expand All @@ -7235,6 +7277,12 @@
"domains": [
"hgtv.com"
]
},
{
"rule": "https://cdn.optimizely.com/js/271989291.js",
"domains": [
"my.zipcar.com"
]
}
]
},
Expand Down Expand Up @@ -7319,10 +7367,23 @@
"primis.tech": {
"rules": [
{
"rule": "live.primis.tech/live/liveView.php",
"rule": "video.primis.tech/",
"domains": [
"wideopencountry.com"
]
},
{
"rule": "live.primis.tech/content/omid/static/",
"domains": [
"wideopencountry.com"
]
},
{
"rule": "live.primis.tech/live/",
"domains": [
"belfastlive.co.uk",
"cornwalllive.com"
"cornwalllive.com",
"wideopencountry.com"
]
}
]
Expand Down Expand Up @@ -7698,6 +7759,16 @@
}
]
},
"skimresources.com": {
"rules": [
{
"rule": "go.skimresources.com/",
"domains": [
"www.lotustalk.com"
]
}
]
},
"slickstream.com": {
"rules": [
{
Expand Down Expand Up @@ -8220,7 +8291,7 @@
"domain": "sundancecatalog.com"
}
],
"hash": "2d5ce26ddae089bcb61e4f4a0b1ae487"
"hash": "e21e28c6597b4ac6ab6c03bdf359912e"
},
"trackingCookies1p": {
"settings": {
Expand Down

0 comments on commit c290fc6

Please sign in to comment.