From aaea3643d87902dfadf0946ee41ce27479de747b Mon Sep 17 00:00:00 2001 From: Fernando Bunn Date: Mon, 7 Oct 2024 15:37:39 +0100 Subject: [PATCH 1/3] Update BSK version https://app.asana.com/0/72649045549333/1208381891916914/f --- 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 af0edcc293..05b25ae89c 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -10934,8 +10934,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 198.2.1; + branch = bunn/netp/featureflag; + 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 9f70b65f0c..2e5ffc6482 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" : "b60b38bace7262e0c4a006018b7e4b060ba4b754", - "version" : "198.2.1" + "branch" : "bunn/netp/featureflag", + "revision" : "ea54c9cd4bdadce0de3b4cb39ab9c5ab03d73e42" } }, { From 1fca1914ea1471f27484ee8bd259704f5665ba77 Mon Sep 17 00:00:00 2001 From: Fernando Bunn Date: Mon, 7 Oct 2024 15:48:00 +0100 Subject: [PATCH 2/3] Add feature flag --- Core/FeatureFlag.swift | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Core/FeatureFlag.swift b/Core/FeatureFlag.swift index 6d5b363635..e4e0b773b1 100644 --- a/Core/FeatureFlag.swift +++ b/Core/FeatureFlag.swift @@ -43,6 +43,9 @@ public enum FeatureFlag: String { case onboardingHighlights case autofillSurveys case autcompleteTabs + + /// https://app.asana.com/0/72649045549333/1208231259093710/f + case networkProtectionUserTips } extension FeatureFlag: FeatureFlagSourceProviding { @@ -92,6 +95,8 @@ extension FeatureFlag: FeatureFlagSourceProviding { return .remoteReleasable(.feature(.autofillSurveys)) case .autcompleteTabs: return .remoteReleasable(.feature(.autocompleteTabs)) + case .networkProtectionUserTips: + return .remoteReleasable(.subfeature(NetworkProtectionSubfeature.userTips)) } } } From 74aa2f609b9fff48518a077125aa52eb34b68ed1 Mon Sep 17 00:00:00 2001 From: Fernando Bunn Date: Tue, 8 Oct 2024 14:17:30 +0100 Subject: [PATCH 3/3] Update BSK --- 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 05b25ae89c..49fcce3244 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -10934,8 +10934,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - branch = bunn/netp/featureflag; - kind = branch; + kind = exactVersion; + version = 198.3.1; }; }; 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 2e5ffc6482..ad79a5fb7e 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" : "bunn/netp/featureflag", - "revision" : "ea54c9cd4bdadce0de3b4cb39ab9c5ab03d73e42" + "revision" : "4e6a8da6a088439565ed7f6a2ac83e83ad7fd10e", + "version" : "198.3.1" } }, {