Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Break the Subscription module’s dependency on BSK #2721

Merged
merged 5 commits into from
May 1, 2024
Merged

Break the Subscription module’s dependency on BSK #2721

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d90799a
Update BSK branch.
samsymons Apr 29, 2024
1331852
Update BSK reference.
samsymons Apr 30, 2024
b21edc9
Merge branch 'main' into sam/remove-subscription-bsk-dependency
samsymons May 1, 2024
37d26fc
Update BSK reference.
samsymons May 1, 2024
1475c54
Set BSK to 143.0.0.
samsymons May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12723,8 +12723,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 141.1.2;
branch = "sam/remove-subscription-bsk-dependency";
kind = branch;
};
};
9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {
Expand Down
4 changes: 2 additions & 2 deletions DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/BrowserServicesKit",
"state" : {
"revision" : "f8c73292d4d6724ec81f98bd29dbb2061f1a8cf6",
"version" : "141.1.2"
"branch" : "sam/remove-subscription-bsk-dependency",
"revision" : "0c569fa98de345b8f6d8411512ffdeeb148d248e"
}
},
{
Expand Down
1 change: 1 addition & 0 deletions DuckDuckGo/NavigationBar/View/AddressBarTextField.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import Combine
import Common
import Suggestions
import Subscription
import BrowserServicesKit

final class AddressBarTextField: NSTextField {

Expand Down
1 change: 0 additions & 1 deletion DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import Combine
import Common
import BrowserServicesKit
import PixelKit

import NetworkProtection
import Subscription

Expand Down
1 change: 1 addition & 0 deletions ...tworkProtection/AppTargets/BothAppTargets/NetworkProtection+ConvenienceInitializers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import NetworkProtection
import NetworkProtectionIPC
import Common
import Subscription
import BrowserServicesKit

extension NetworkProtectionDeviceManager {

Expand Down
1 change: 1 addition & 0 deletions DuckDuckGo/Preferences/Model/PreferencesSection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import Foundation
import SwiftUI
import Subscription
import BrowserServicesKit

struct PreferencesSection: Hashable, Identifiable {
let id: PreferencesSectionIdentifier
Expand Down
1 change: 1 addition & 0 deletions DuckDuckGo/Subscription/DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import Foundation
import Subscription
import BrowserServicesKit

extension DefaultSubscriptionFeatureAvailability {
convenience init() {
Expand Down
1 change: 1 addition & 0 deletions DuckDuckGo/Tab/Navigation/RedirectNavigationResponder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import Navigation
import Foundation
import Subscription
import BrowserServicesKit

struct RedirectNavigationResponder: NavigationResponder {

Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo/Waitlist/Views/WaitlistThankYouPromptPresenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import AppKit
import Foundation
import Subscription
import BrowserServicesKit
import PixelKit

final class WaitlistThankYouPromptPresenter {
Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo/Waitlist/Views/WaitlistViewControllerPresenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import Foundation
import UserNotifications
import Subscription
import BrowserServicesKit

protocol WaitlistViewControllerPresenter {
static func show(completion: (() -> Void)?)
Expand Down
Loading