Migrates RCPurchases (#758)

* Start of migration * Migrates RCPurchases Resolves #546 (last file to be migrated) * Use Nimble's throwAssertion predicate * Update for comments * Start of migration * Sorted project and files. * Fix build target for IntroEligibilityCalculatorTests * Remove debug print * Add back `sharedPurchases`
RevenueCat · Aug 23, 2021 · 444a979 · 444a979
1 parent 5f91ef7
commit 444a979
Show file tree

Hide file tree

Showing 42 changed files with 1,648 additions and 1,705 deletions.
diff --git a/PublicSDKAPITester/RCEntitlementInfoAPI.m b/PublicSDKAPITester/RCEntitlementInfoAPI.m
@@ -6,8 +6,6 @@
 //  Copyright © 2021 Purchases. All rights reserved.
 //
 
-
-@import Purchases;
 @import PurchasesCoreSwift;
 
 #import "RCEntitlementInfoAPI.h"

diff --git a/PublicSDKAPITester/RCEntitlementInfosAPI.m b/PublicSDKAPITester/RCEntitlementInfosAPI.m
@@ -6,7 +6,6 @@
 //  Copyright © 2021 Purchases. All rights reserved.
 //
 
-@import Purchases;
 @import PurchasesCoreSwift;
 
 #import "RCEntitlementInfosAPI.h"

diff --git a/PublicSDKAPITester/RCIntroEligibilityAPI.m b/PublicSDKAPITester/RCIntroEligibilityAPI.m
@@ -6,7 +6,7 @@
 //  Copyright © 2021 Purchases. All rights reserved.
 //
 
-@import Purchases;
+@import PurchasesCoreSwift;
 #import "RCIntroEligibilityAPI.h"
 
 @implementation RCIntroEligibilityAPI

diff --git a/PublicSDKAPITester/RCOfferingAPI.m b/PublicSDKAPITester/RCOfferingAPI.m
@@ -6,7 +6,7 @@
 //  Copyright © 2021 Purchases. All rights reserved.
 //
 
-@import Purchases;
+@import PurchasesCoreSwift;
 #import "RCOfferingAPI.h"
 
 @implementation RCOfferingAPI

diff --git a/PublicSDKAPITester/RCOfferingsAPI.m b/PublicSDKAPITester/RCOfferingsAPI.m
@@ -6,7 +6,7 @@
 //  Copyright © 2021 Purchases. All rights reserved.
 //
 
-@import Purchases;
+@import PurchasesCoreSwift;
 
 #import "RCOfferingsAPI.h"
 

diff --git a/PublicSDKAPITester/RCPurchasesAPI.m b/PublicSDKAPITester/RCPurchasesAPI.m
@@ -5,7 +5,6 @@
 //  Created by Joshua Liebowitz on 6/18/21.
 //
 
-@import Purchases;
 @import PurchasesCoreSwift;
 @import StoreKit;
 
@@ -43,6 +42,9 @@ + (void)checkAPI {
     // TODO: iOS ONLY, TEST FOR THIS API BY LOOKING UP SELECTOR
     // [p presentCodeRedemptionSheet];
     RCPurchases *p = [RCPurchases configureWithAPIKey:@""];
+    [RCPurchases configureWithAPIKey:@"" appUserID:@""];
+    [RCPurchases configureWithAPIKey:@"" appUserID:@"" observerMode:false];
+    [RCPurchases configureWithAPIKey:@"" appUserID:@"" observerMode:false userDefaults:nil];
 
     [RCPurchases setLogHandler:^(RCLogLevel l, NSString *i) {}];
     canI = [RCPurchases canMakePayments];
@@ -70,10 +72,7 @@ + (void)checkAPI {
     SKPaymentDiscount *skmd = [[SKPaymentDiscount alloc] init];
 
     RCPackage *pack = [[RCPackage alloc] initWithIdentifier:@"" packageType:RCPackageTypeCustom product:skp offeringIdentifier:@""];
-    [RCPurchases configureWithAPIKey:@"" appUserID:@""];
-    [RCPurchases configureWithAPIKey:@"" appUserID:@"" observerMode:false];
-    [RCPurchases configureWithAPIKey:@"" appUserID:@"" observerMode:false userDefaults:nil];
-
+
     [p invalidatePurchaserInfoCache];
 
     NSDictionary<NSString *, NSString *> *attributes = nil;
@@ -103,7 +102,6 @@ + (void)checkAPI {
     [p restoreTransactionsWithCompletionBlock:^(RCPurchaserInfo *i, NSError *e) {}];
     [p syncPurchasesWithCompletionBlock:^(RCPurchaserInfo *i, NSError *e) {}];
     [p checkTrialOrIntroductoryPriceEligibility:@[@""] completionBlock:^(NSDictionary<NSString *,RCIntroEligibility *> *d) { }];
-    [p checkTrialOrIntroductoryPriceEligibility:@[@""] completionBlock:^(NSDictionary<NSString *,RCIntroEligibility *> *r) { }];
     [p paymentDiscountForProductDiscount:skpd product:skp completion:^(SKPaymentDiscount *d, NSError *e) { }];
     [p purchaseProduct:skp withDiscount:skmd completionBlock:^(SKPaymentTransaction *t, RCPurchaserInfo *i, NSError *e, BOOL userCancelled) { }];
     [p purchasePackage:pack withDiscount:skmd completionBlock:^(SKPaymentTransaction *t, RCPurchaserInfo *i, NSError *e, BOOL userCancelled) { }];

diff --git a/PublicSDKAPITester/RCPurchasesErrorUtilsAPI.m b/PublicSDKAPITester/RCPurchasesErrorUtilsAPI.m
@@ -11,8 +11,8 @@
 //
 //  Created by César de la Vega on 7/21/21.
 
-@import Purchases;
 @import PurchasesCoreSwift;
+@import StoreKit;
 
 #import "RCPurchasesErrorUtilsAPI.h"
 

diff --git a/PublicSDKAPITester/RCTransactionAPI.m b/PublicSDKAPITester/RCTransactionAPI.m
@@ -6,7 +6,6 @@
 //  Copyright © 2021 Purchases. All rights reserved.
 //
 
-@import Purchases;
 @import PurchasesCoreSwift;
 
 #import "RCTransactionAPI.h"

diff --git a/Purchases.xcodeproj/project.pbxproj b/Purchases.xcodeproj/project.pbxproj
diff --git a/Purchases/ProtectedExtensions/RCPurchases+Protected.h b/Purchases/ProtectedExtensions/RCPurchases+Protected.h
diff --git a/Purchases/Public/Purchases.h b/Purchases/Public/Purchases.h
@@ -16,5 +16,3 @@ FOUNDATION_EXPORT double PurchasesVersionNumber;
  Purchases version string
  */
 FOUNDATION_EXPORT const unsigned char PurchasesVersionString[];
-
-#import "RCPurchases.h"