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

Jump to bottom

Fix breaking change in objc in 7.4.0 #572

Merged
merged 2 commits into from
Nov 21, 2023
Merged

Fix breaking change in objc in 7.4.0 #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1e5f6b
Fix breaking change in 7.4.0
tonidero Nov 20, 2023
95ac2e8
dissambiguate both configure methods
tonidero Nov 20, 2023
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
9 changes: 9 additions & 0 deletions ios/PurchasesHybridCommon/ObjCAPITester/RCPurchases+HybridAdditionsAPITest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@ - (void)testAPI {
dangerousSettings:nil
shouldShowInAppMessagesAutomatically:NO
verificationMode:@""];
RCPurchases *purchases2 __unused = [RCPurchases configureWithAPIKey:@""
appUserID:@""
observerMode:NO
userDefaultsSuiteName:nil
platformFlavor:nil
platformFlavorVersion:@""
usesStoreKit2IfAvailable:YES
dangerousSettings:nil
shouldShowInAppMessagesAutomatically:NO];
}

@end
Expand Down
25 changes: 24 additions & 1 deletion ios/PurchasesHybridCommon/PurchasesHybridCommon/Purchases+HybridAdditions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import RevenueCat
usesStoreKit2IfAvailable: Bool = false,
dangerousSettings: DangerousSettings?,
shouldShowInAppMessagesAutomatically: Bool = true,
verificationMode: String? = nil) -> Purchases {
verificationMode: String?) -> Purchases {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The compiler didn't complain 😕 but I think this is needed to disambiguate both configure methods.

var userDefaults: UserDefaults?
if let userDefaultsSuiteName = userDefaultsSuiteName {
userDefaults = UserDefaults(suiteName: userDefaultsSuiteName)
Expand Down Expand Up @@ -68,6 +68,29 @@ import RevenueCat
return purchases
}


@objc(configureWithAPIKey:appUserID:observerMode:userDefaultsSuiteName:platformFlavor:platformFlavorVersion:
usesStoreKit2IfAvailable:dangerousSettings:shouldShowInAppMessagesAutomatically:)
static func configure(apiKey: String,
appUserID: String?,
observerMode: Bool,
userDefaultsSuiteName: String?,
platformFlavor: String?,
platformFlavorVersion: String?,
usesStoreKit2IfAvailable: Bool = false,
dangerousSettings: DangerousSettings?,
shouldShowInAppMessagesAutomatically: Bool = true) -> Purchases {
return configure(apiKey: apiKey,
appUserID: appUserID,
observerMode: observerMode,
userDefaultsSuiteName: userDefaultsSuiteName,
platformFlavor: platformFlavor,
platformFlavorVersion: platformFlavorVersion,
usesStoreKit2IfAvailable: usesStoreKit2IfAvailable,
dangerousSettings: dangerousSettings,
shouldShowInAppMessagesAutomatically: shouldShowInAppMessagesAutomatically,
verificationMode: nil)
}
}

extension LogLevel {
Expand Down