diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 7742eb8eaa..1942ade226 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -13740,7 +13740,7 @@ repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { kind = exactVersion; - version = 190.0.0; + version = 190.0.1; }; }; 9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 6c396add94..d2753d8257 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/BrowserServicesKit", "state" : { - "revision" : "ac53011582abcca4aefd66f15308332273eecb49", - "version" : "190.0.0" + "revision" : "245750c9ca559813307641e819fb27c6d294339f", + "version" : "190.0.1" } }, { diff --git a/DuckDuckGo/Application/AppConfigurationURLProvider.swift b/DuckDuckGo/Application/AppConfigurationURLProvider.swift index a0aa950a9b..188a95d698 100644 --- a/DuckDuckGo/Application/AppConfigurationURLProvider.swift +++ b/DuckDuckGo/Application/AppConfigurationURLProvider.swift @@ -58,7 +58,6 @@ struct AppConfigurationURLProvider: ConfigurationURLProviding { case .surrogates: return URL(string: "https://staticcdn.duckduckgo.com/surrogates.txt")! case .trackerDataSet: return URL(string: "https://staticcdn.duckduckgo.com/trackerblocking/v6/current/macos-tds.json")! // In archived repo, to be refactored shortly (https://staticcdn.duckduckgo.com/useragents/social_ctp_configuration.json) - case .FBConfig: return URL(string: "https://staticcdn.duckduckgo.com/useragents/")! case .remoteMessagingConfig: return RemoteMessagingClient.Constants.endpoint } } diff --git a/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift b/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift index 20214ac6cc..bc5dffb816 100644 --- a/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift +++ b/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift @@ -51,7 +51,6 @@ public struct UserDefaultsWrapper { case configStorageBloomFilterExclusionsEtag = "config.storage.bloomfilter.exclusions.etag" case configStorageSurrogatesEtag = "config.storage.surrogates.etag" case configStoragePrivacyConfigurationEtag = "config.storage.privacyconfiguration.etag" - case configFBConfigEtag = "config.storage.fbconfig.etag" case configStorageRemoteMessagingConfigEtag = "config.storage.remotemessagingconfig.etag" case configLastInstalled = "config.last.installed" diff --git a/DuckDuckGo/Configuration/ConfigurationStore.swift b/DuckDuckGo/Configuration/ConfigurationStore.swift index 5d21979c29..0f9b5ddcfd 100644 --- a/DuckDuckGo/Configuration/ConfigurationStore.swift +++ b/DuckDuckGo/Configuration/ConfigurationStore.swift @@ -31,7 +31,6 @@ final class ConfigurationStore: ConfigurationStoring { .surrogates: "surrogates.txt", .privacyConfiguration: "macos-config.json", .trackerDataSet: "tracker-radar.json", - .FBConfig: "social_ctp_configuration.json", .remoteMessagingConfig: "remote-messaging-config.json" ] @@ -55,9 +54,6 @@ final class ConfigurationStore: ConfigurationStoring { @UserDefaultsWrapper(key: .configStoragePrivacyConfigurationEtag, defaultValue: nil) private var privacyConfigurationEtag: String? - @UserDefaultsWrapper(key: .configFBConfigEtag, defaultValue: nil) - private var FBConfigEtag: String? - @UserDefaultsWrapper(key: .configStorageRemoteMessagingConfigEtag, defaultValue: nil) private var remoteMessagingConfigEtag: String? @@ -71,7 +67,6 @@ final class ConfigurationStore: ConfigurationStoring { case .surrogates: return surrogatesEtag case .trackerDataSet: return trackerRadarEtag case .privacyConfiguration: return privacyConfigurationEtag - case .FBConfig: return FBConfigEtag case .remoteMessagingConfig: return remoteMessagingConfigEtag } } @@ -92,7 +87,6 @@ final class ConfigurationStore: ConfigurationStoring { case .surrogates: surrogatesEtag = etag case .trackerDataSet: trackerRadarEtag = etag case .privacyConfiguration: privacyConfigurationEtag = etag - case .FBConfig: FBConfigEtag = etag case .remoteMessagingConfig: remoteMessagingConfigEtag = etag } } @@ -126,7 +120,6 @@ final class ConfigurationStore: ConfigurationStoring { Logger.config.info("surrogatesEtag \(self.surrogatesEtag ?? "", privacy: .public)") Logger.config.info("trackerRadarEtag \(self.trackerRadarEtag ?? "", privacy: .public)") Logger.config.info("privacyConfigurationEtag \(self.privacyConfigurationEtag ?? "", privacy: .public)") - Logger.config.info("FBConfigEtag \(self.FBConfigEtag ?? "", privacy: .public)") Logger.config.info("remoteMessagingConfig \(self.remoteMessagingConfigEtag ?? "", privacy: .public)") } diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift index a79685ddb4..068b038904 100644 --- a/LocalPackages/DataBrokerProtection/Package.swift +++ b/LocalPackages/DataBrokerProtection/Package.swift @@ -29,7 +29,7 @@ let package = Package( targets: ["DataBrokerProtection"]) ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "190.0.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "190.0.1"), .package(path: "../SwiftUIExtensions"), .package(path: "../XPCHelper"), ], diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift index b1da627366..804b34fd0f 100644 --- a/LocalPackages/NetworkProtectionMac/Package.swift +++ b/LocalPackages/NetworkProtectionMac/Package.swift @@ -32,7 +32,7 @@ let package = Package( .library(name: "VPNAppLauncher", targets: ["VPNAppLauncher"]), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "190.0.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "190.0.1"), .package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.3"), .package(path: "../AppLauncher"), .package(path: "../UDSHelper"), diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift index dc054cbeb6..002fad05cc 100644 --- a/LocalPackages/SubscriptionUI/Package.swift +++ b/LocalPackages/SubscriptionUI/Package.swift @@ -12,7 +12,7 @@ let package = Package( targets: ["SubscriptionUI"]), ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "190.0.0"), + .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "190.0.1"), .package(path: "../SwiftUIExtensions") ], targets: [ diff --git a/UnitTests/AppDelegate/AppConfigurationURLProviderTests.swift b/UnitTests/AppDelegate/AppConfigurationURLProviderTests.swift index b23486adf8..2fc10c8ce0 100644 --- a/UnitTests/AppDelegate/AppConfigurationURLProviderTests.swift +++ b/UnitTests/AppDelegate/AppConfigurationURLProviderTests.swift @@ -28,7 +28,6 @@ final class AppConfigurationURLProviderTests: XCTestCase { XCTAssertEqual(AppConfigurationURLProvider().url(for: .privacyConfiguration).absoluteString, "https://staticcdn.duckduckgo.com/trackerblocking/config/v4/macos-config.json") XCTAssertEqual(AppConfigurationURLProvider().url(for: .surrogates).absoluteString, "https://staticcdn.duckduckgo.com/surrogates.txt") XCTAssertEqual(AppConfigurationURLProvider().url(for: .trackerDataSet).absoluteString, "https://staticcdn.duckduckgo.com/trackerblocking/v6/current/macos-tds.json") - XCTAssertEqual(AppConfigurationURLProvider().url(for: .FBConfig).absoluteString, "https://staticcdn.duckduckgo.com/useragents/") } }