From c6b3bda73350db335713b8e8dfa2fbfffbc65832 Mon Sep 17 00:00:00 2001 From: Michal Smaga Date: Wed, 4 Dec 2024 16:14:13 +0100 Subject: [PATCH 1/3] Switch to a BSK fix branch --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index f4c3a54c31..c9876d27df 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -11053,8 +11053,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = "211.1.3-1"; + branch = "michal/fix-featuremapping-cache"; + kind = branch; }; }; 9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 5ef0b5dc49..74fc8ab49c 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" : "114cdbfcfae15ad8c7d5e502832e94061aef7cff", - "version" : "211.1.3-1" + "branch" : "michal/fix-featuremapping-cache", + "revision" : "a2ef3a3bac9fa59115dafe3cb7109ca12ad8098b" } }, { From fc41e214005e328a52b652624bc6a48a211f9427 Mon Sep 17 00:00:00 2001 From: Michal Smaga Date: Wed, 4 Dec 2024 16:15:31 +0100 Subject: [PATCH 2/3] Add missing subscriptionFeatureFlagger init param --- DuckDuckGo/AppDependencyProvider.swift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/DuckDuckGo/AppDependencyProvider.swift b/DuckDuckGo/AppDependencyProvider.swift index b378ab86e9..8402a511cd 100644 --- a/DuckDuckGo/AppDependencyProvider.swift +++ b/DuckDuckGo/AppDependencyProvider.swift @@ -134,7 +134,10 @@ final class AppDependencyProvider: DependencyProvider { } } - let subscriptionManager = DefaultSubscriptionManager(storePurchaseManager: DefaultStorePurchaseManager(subscriptionFeatureMappingCache: subscriptionFeatureMappingCache), + let storePurchaseManager = DefaultStorePurchaseManager(subscriptionFeatureMappingCache: subscriptionFeatureMappingCache, + subscriptionFeatureFlagger: subscriptionFeatureFlagger) + + let subscriptionManager = DefaultSubscriptionManager(storePurchaseManager: storePurchaseManager, accountManager: accountManager, subscriptionEndpointService: subscriptionService, authEndpointService: authService, From cee9432302082cf754b75508bc03c52a1c3ad85c Mon Sep 17 00:00:00 2001 From: Michal Smaga Date: Wed, 4 Dec 2024 16:37:12 +0100 Subject: [PATCH 3/3] Switch to BSK hotfix branch --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index c9876d27df..30b16b4593 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -11053,8 +11053,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - branch = "michal/fix-featuremapping-cache"; - kind = branch; + kind = exactVersion; + version = "211.1.3-2"; }; }; 9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 74fc8ab49c..efed578d6d 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" : { - "branch" : "michal/fix-featuremapping-cache", - "revision" : "a2ef3a3bac9fa59115dafe3cb7109ca12ad8098b" + "revision" : "a1507705d156316fa1a06b71d42e43bef9d0c2d9", + "version" : "211.1.3-2" } }, {