WIP: Update to 12.5 compatible stripe pod

CHANGELOG.md

@@ -1,3 +1,6 @@
+## [1.0.12]
+- update Stripe iOS dependency to support Xcode 12.5 (#286) (by @mclark4386)
+
 ## [1.0.11]
 - fix #258 (by @Trede98)
 

ios/Classes/StripePaymentPlugin.m

@@ -1,7 +1,8 @@
 #import "StripePaymentPlugin.h"
-#import <Stripe/Stripe.h>
 #import "TPSStripeManager.h"
 
+@import Stripe;
+
 @implementation StripePaymentPlugin {
     FlutterResult flutterResult;
     StripeModule* stripeModule;

ios/Classes/TPSStripeManager.h

@@ -8,9 +8,10 @@
 
 #import <Foundation/Foundation.h>
 #import <PassKit/PassKit.h>
-#import <Stripe/Stripe.h>
 #import "RCTConvert.h"
 
+@import Stripe;
+
 /**
  * Block that bridge modules use to resolve the JS promise waiting for a result.
  * Nil results are supported and are converted to JS's undefined value.

ios/Classes/TPSStripeManager.m

@@ -7,11 +7,12 @@
 //
 
 #import "TPSStripeManager.h"
-#import <Stripe/Stripe.h>
 
 #import "TPSError.h"
 #import "TPSStripeManager+Constants.h"
 
+@import Stripe;
+
 // If you change these, make sure to also change:
 //  android/src/main/java/com/gettipsi/stripe/StripeModule.java
 // Relevant Docs:
@@ -301,7 +302,7 @@ -(void)init:(NSDictionary *)options errorCodes:(NSDictionary *)errors {
     publishableKey = options[@"publishableKey"];
     merchantId = options[@"merchantId"];
     errorCodes = errors;
-    [Stripe setDefaultPublishableKey:publishableKey];
+    [StripeAPI setDefaultPublishableKey:publishableKey];
 }
 
 -(void)setStripeAccount:(NSString *)_stripeAccount {
@@ -856,7 +857,7 @@ -(void)paymentRequestWithApplePay:(NSArray *)items
         [summaryItems addObject:summaryItem];
     }
 
-    PKPaymentRequest *paymentRequest = [Stripe paymentRequestWithMerchantIdentifier:merchantId country:countryCode currency:currencyCode];
+    PKPaymentRequest *paymentRequest = [StripeAPI paymentRequestWithMerchantIdentifier:merchantId country:countryCode currency:currencyCode];
 
     [paymentRequest setRequiredShippingAddressFields:requiredShippingAddressFields];
     [paymentRequest setRequiredBillingAddressFields:requiredBillingAddressFields];
@@ -1183,7 +1184,7 @@ - (void)resetApplePayCallback {
 }
 
 - (BOOL)canSubmitPaymentRequest:(PKPaymentRequest *)paymentRequest rejecter:(RCTPromiseRejectBlock)reject {
-    if (![Stripe deviceSupportsApplePay]) {
+    if (![StripeAPI deviceSupportsApplePay]) {
         NSDictionary *error = [errorCodes valueForKey:kErrorKeyDeviceNotSupportsNativePay];
         reject(error[kErrorKeyCode], error[kErrorKeyDescription], nil);
         return NO;
@@ -1211,7 +1212,7 @@ - (BOOL)canSubmitPaymentRequest:(PKPaymentRequest *)paymentRequest rejecter:(RCT
 
 - (void)addCardViewController:(STPAddCardViewController *)addCardViewController
        didCreatePaymentMethod:(STPPaymentMethod *)paymentMethod
-                   completion:(STPErrorBlock)completion {
+                   completion:(void (^)(NSError * _Nullable))completion {
     [RCTPresentedViewController() dismissViewControllerAnimated:YES completion:nil];
 
     requestIsCompleted = YES;
@@ -1295,7 +1296,7 @@ - (STPAPIClient *)newAPIClient {
                                             url:TPSAppInfoURL];
     });
 
-    STPAPIClient * client = [[STPAPIClient alloc] initWithPublishableKey:[Stripe defaultPublishableKey]];
+    STPAPIClient * client = [[STPAPIClient alloc] initWithPublishableKey:[StripeAPI defaultPublishableKey]];
     client.appInfo = info;
     client.stripeAccount = stripeAccount;
 
@@ -1488,7 +1489,7 @@ - (NSString *)cardBrandAsBrandSlug:(STPCardBrand)inputBrand {
             return @"discover";
         case STPCardBrandDinersClub:
             return @"diners";
-        case STPCardBrandMasterCard:
+        case STPCardBrandMastercard:
             return @"mastercard";
         case STPCardBrandUnionPay:
             return @"unionpay";
@@ -1500,7 +1501,7 @@ - (NSString *)cardBrandAsBrandSlug:(STPCardBrand)inputBrand {
 
 /// API: https://stripe.com/docs/api/cards/object#card_object-brand
 - (NSString *)cardBrandAsPresentableBrandString:(STPCardBrand)inputBrand {
-    return STPStringFromCardBrand(inputBrand);
+    return [STPCardBrandUtilities stringFromCardBrand:inputBrand];
 }
 
 - (NSString *)cardFunding:(STPCardFundingType)inputFunding {
@@ -1599,7 +1600,7 @@ - (NSString *)sourceType:(STPSourceType)inputType {
             return @"bancontact";
         case STPSourceTypeGiropay:
             return @"giropay";
-        case STPSourceTypeIDEAL:
+        case STPSourceTypeiDEAL:
             return @"ideal";
         case STPSourceTypeSEPADebit:
             return @"sepaDebit";

ios/stripe_payment.podspec

@@ -15,6 +15,6 @@ A new flutter plugin project.
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
-  s.dependency 'Stripe', '~> 19.4.0'
-  s.ios.deployment_target = '10.0'
+  s.dependency 'Stripe', '~> 21.3.1'
+  s.ios.deployment_target = '11.0'
 end

pubspec.yaml

@@ -1,6 +1,6 @@
 name: stripe_payment
 description: A Flutter plugin to integrate the stripe libraries for iOS and Android. Supports Apple / Google Pay, SCA, PSD2 and much more.
-version: 1.0.11
+version: 1.0.12
 homepage: https://github.com/jonasbark/flutter_stripe_payment
 
 environment: