fix #2161 remove setting r8 fullmode to false use proguard instead (#2162)

* fix #2161 remove setting r8 fullmode to false use proguard instead

* fix readme for stripe package

* chore fix integration test

Author: remonh87

README.md

@@ -59,14 +59,11 @@ This plugin requires several changes to be able to work on Android devices. Plea
 -dontwarn com.stripe.android.pushProvisioning.PushProvisioningActivityStarter$Error
 -dontwarn com.stripe.android.pushProvisioning.PushProvisioningActivityStarter
 -dontwarn com.stripe.android.pushProvisioning.PushProvisioningEphemeralKeyProvider
+# Keep Stripe classes
+-keep class com.stripe.** { *; }
 ```
-8. Add the following line to your `gradle.properties` file: [example](https://github.com/flutter-stripe/flutter_stripe/blob/master/example/android/gradle.properties)
-```properties
-android.enableR8.fullMode=false
-```
-This will prevent crashes with the Stripe SDK on Android (see [issue](https://github.com/flutter-stripe/flutter_stripe/issues/1909)).
 
-9. Rebuild the app, as the above changes don't update with hot reload
+8. Rebuild the app, as the above changes don't update with hot reload
 
 These changes are needed because the Android Stripe SDK requires the use of the AppCompat theme for their UI components and the Support Fragment Manager for the Payment Sheets
 

example/android/app/proguard-rules.pro

@@ -2,4 +2,6 @@
 -dontwarn com.stripe.android.pushProvisioning.PushProvisioningActivityStarter$Args
 -dontwarn com.stripe.android.pushProvisioning.PushProvisioningActivityStarter$Error
 -dontwarn com.stripe.android.pushProvisioning.PushProvisioningActivityStarter
--dontwarn com.stripe.android.pushProvisioning.PushProvisioningEphemeralKeyProvider
+-dontwarn com.stripe.android.pushProvisioning.PushProvisioningEphemeralKeyProvider
+# Keep Stripe classes
+-keep class com.stripe.** { *; }

example/android/gradle.properties

@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-android.enableR8.fullMode=false

example/integration_test/app_test.dart

@@ -68,7 +68,7 @@ void main() {
         number: '4242424242424242',
         cvc: '424',
         expirationMonth: 04,
-        expirationYear: 2025,
+        expirationYear: 2026,
       );
       await Stripe.instance.dangerouslyUpdateCardDetails(cardDetails);
 

example/integration_test/payment_method_test.dart

@@ -41,7 +41,7 @@ void main() {
         number: '378282246310005', // Use a card does not support 3DS
         cvc: '424',
         expirationMonth: 04,
-        expirationYear: 2025,
+        expirationYear: 2026,
       ));
 
       final paymentIntent = await Stripe.instance.confirmPayment(
@@ -63,7 +63,7 @@ void main() {
         number: '4242424242424242',
         cvc: '424',
         expirationMonth: 04,
-        expirationYear: 2025,
+        expirationYear: 2026,
       ));
 
       final paymentMethod = await Stripe.instance.createPaymentMethod(
@@ -78,7 +78,7 @@ void main() {
       expect(paymentMethod.card.brand, equals('Visa'));
       expect(paymentMethod.card.country, equals('US'));
       expect(paymentMethod.card.expMonth, equals(04));
-      expect(paymentMethod.card.expYear, equals(2025));
+      expect(paymentMethod.card.expYear, equals(2026));
       expect(paymentMethod.card.last4, equals('4242'));
     });
 
@@ -87,7 +87,7 @@ void main() {
         number: '4242424242424242',
         cvc: '424',
         expirationMonth: 04,
-        expirationYear: 2025,
+        expirationYear: 2026,
       ));
 
       final cardPaymentMethod = await Stripe.instance.createPaymentMethod(
@@ -110,7 +110,7 @@ void main() {
       expect(paymentMethod.card.brand, equals('Visa'));
       expect(paymentMethod.card.country, equals('US'));
       expect(paymentMethod.card.expMonth, equals(04));
-      expect(paymentMethod.card.expYear, equals(2025));
+      expect(paymentMethod.card.expYear, equals(2026));
       expect(paymentMethod.card.last4, equals('4242'));
     });
 
@@ -119,7 +119,7 @@ void main() {
         number: '4242424242424242',
         cvc: '424',
         expirationMonth: 04,
-        expirationYear: 2025,
+        expirationYear: 2026,
       ));
 
       final token = await Stripe.instance.createToken(
@@ -137,7 +137,7 @@ void main() {
       expect(paymentMethod.card.brand, equals('Visa'));
       expect(paymentMethod.card.country, equals('US'));
       expect(paymentMethod.card.expMonth, equals(04));
-      expect(paymentMethod.card.expYear, equals(2025));
+      expect(paymentMethod.card.expYear, equals(2026));
       expect(paymentMethod.card.last4, equals('4242'));
     });
     testWidgets('alipay', (tester) async {

packages/stripe/README.md

@@ -59,14 +59,11 @@ This plugin requires several changes to be able to work on Android devices. Plea
 -dontwarn com.stripe.android.pushProvisioning.PushProvisioningActivityStarter$Error
 -dontwarn com.stripe.android.pushProvisioning.PushProvisioningActivityStarter
 -dontwarn com.stripe.android.pushProvisioning.PushProvisioningEphemeralKeyProvider
+# Keep Stripe classes
+-keep class com.stripe.** { *; }
 ```
-8. Add the following line to your `gradle.properties` file: [example](https://github.com/flutter-stripe/flutter_stripe/blob/master/example/android/gradle.properties)
-```properties
-android.enableR8.fullMode=false
-```
-This will prevent crashes with the Stripe SDK on Android (see [issue](https://github.com/flutter-stripe/flutter_stripe/issues/1909)).
 
-9. Rebuild the app, as the above changes don't update with hot reload
+8. Rebuild the app, as the above changes don't update with hot reload
 
 These changes are needed because the Android Stripe SDK requires the use of the AppCompat theme for their UI components and the Support Fragment Manager for the Payment Sheets