Skip to content
This repository has been archived by the owner on Feb 24, 2025. It is now read-only.

Privacy Pro Free Trials - Models and API #3641

Merged
merged 4 commits into from
Dec 11, 2024
Merged

Privacy Pro Free Trials - Models and API #3641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
643f29b
Rebase main
aataraxiaa Dec 11, 2024
4ecfaa1
Rebase merge
aataraxiaa Dec 11, 2024
6bb5455
Force cast SubscriptionProduct to Product in Debug menu code
aataraxiaa Dec 6, 2024
ab5e6b1
Bump BSK to 221.1.0
aataraxiaa Dec 11, 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
2 changes: 1 addition & 1 deletion DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15237,7 +15237,7 @@
repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 221.0.1;
version = 221.1.0;
};
};
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" : "b7f7ba99f7c77b576679eee426ddd80320dc74d8",
"version" : "221.0.1"
"revision" : "e8654e1a51bd20fa8fa234a4155a9aec37411ed1",
"version" : "221.1.0"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/DataBrokerProtection/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ let package = Package(
targets: ["DataBrokerProtection"])
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "221.0.1"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "221.1.0"),
.package(path: "../SwiftUIExtensions"),
.package(path: "../AppKitExtensions"),
.package(path: "../XPCHelper"),
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/FeatureFlags/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ let package = Package(
targets: ["FeatureFlags"]),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "221.0.1"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "221.1.0"),
],
targets: [
// Targets are the basic building blocks of a package, defining a module or a test suite.
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/NetworkProtectionMac/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ let package = Package(
.library(name: "VPNAppLauncher", targets: ["VPNAppLauncher"]),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "221.0.1"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "221.1.0"),
.package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.3"),
.package(path: "../AppLauncher"),
.package(path: "../UDSHelper"),
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/NewTabPage/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ let package = Package(
targets: ["NewTabPage"]),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "221.0.1"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "221.1.0"),
.package(path: "../WebKitExtensions"),
.package(path: "../Utilities"),
],
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/SubscriptionUI/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ let package = Package(
targets: ["SubscriptionUI"]),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "221.0.1"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "221.1.0"),
.package(path: "../SwiftUIExtensions"),
.package(path: "../FeatureFlags")
],
Expand Down
6 changes: 5 additions & 1 deletion ...ackages/SubscriptionUI/Sources/SubscriptionUI/DebugMenu/DebugPurchaseViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,16 @@ public final class DebugPurchaseViewController: NSViewController {
}

manager.$availableProducts.combineLatest(manager.$purchasedProductIDs, manager.$purchaseQueue).receive(on: RunLoop.main).sink { [weak self] availableProducts, purchasedProductIDs, purchaseQueue in

// swiftlint:disable:next force_cast
let products = availableProducts as! [Product]

print(" -- got combineLatest -")
print(" -- got combineLatest - availableProducts: \(availableProducts.map { $0.id }.joined(separator: ","))")
print(" -- got combineLatest - purchasedProducts: \(purchasedProductIDs.joined(separator: ","))")
print(" -- got combineLatest - purchaseQueue: \(purchaseQueue.joined(separator: ","))")

let sortedProducts = availableProducts.sorted(by: { $0.price > $1.price })
let sortedProducts = products.sorted(by: { $0.price > $1.price })

self?.model.subscriptions = sortedProducts.map { SubscriptionRowModel(product: $0,
isPurchased: purchasedProductIDs.contains($0.id),
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/WebKitExtensions/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "221.0.1"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "221.1.0"),
.package(path: "../AppKitExtensions")
],
targets: [
Expand Down
Loading