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

fix: add proguard file to keep optional push provisioning classes (if present) #1215

Merged
merged 4 commits into from
Dec 1, 2022
Merged

fix: add proguard file to keep optional push provisioning classes (if present) #1215

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
3c01201
Add module pro guard file
charliecruzan-stripe Nov 29, 2022
715770c
example app changes
charliecruzan-stripe Nov 29, 2022
723263f
[skip actions] changelog
charliecruzan-stripe Nov 29, 2022
56ba20a
Merge branch 'master' into charliecruzan/provisioning-pro-guard-rules
charliecruzan-stripe Nov 29, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
## Fixes

- Fixed an issue where builds would error with the message `'const' enums are not supported.` [see commit](https://github.com/stripe/stripe-react-native/commit/f882bfa588aa6d23a980b4b43d2cca660ca1dd2a)
- Fixed an issue where the `canAddCardToWallet` method would sometimes wrongly return `false` with a `details.status` of `MISSING_CONFIGURATION` in production builds. [#1215](https://github.com/stripe/stripe-react-native/pull/1215)
- Fixed an issue on Android where, for certain countries, the postal code would not be enabled but would still be required. [#1213](https://github.com/stripe/stripe-react-native/pull/1213)

## 0.21.0 - 2022-11-15
Expand Down
1 change: 1 addition & 0 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ android {
versionName "1.0"
vectorDrawables.useSupportLibrary = true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'proguard-rules.txt'
}

buildTypes {
Expand Down
7 changes: 7 additions & 0 deletions android/proguard-rules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
-keepclassmembers class com.google.android.gms.tapandpay.** {
public *;
}

-keepclassmembers class com.stripe.android.pushProvisioning.** {
public *;
}
2 changes: 2 additions & 0 deletions example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,8 @@ android {
buildTypes {
debug {
signingConfig signingConfigs.debug
minifyEnabled true
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
}
release {
// Caution! In production, you need to generate your own keystore file.
Expand Down
2 changes: 2 additions & 0 deletions example/android/app/proguard-rules.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@
# http://developer.android.com/guide/developing/tools/proguard.html

# Add any project specific keep options here:
-keep class com.facebook.react.devsupport.** { *; }
-dontwarn com.facebook.react.devsupport.**
6 changes: 3 additions & 3 deletions example/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,15 +374,15 @@ PODS:
- StripePayments (= 23.2.0)
- StripePaymentsUI (= 23.2.0)
- StripeUICore (= 23.2.0)
- stripe-react-native (0.20.0):
- stripe-react-native (0.21.0):
- React-Core
- Stripe (~> 23.2.0)
- StripeApplePay (~> 23.2.0)
- StripeFinancialConnections (~> 23.2.0)
- StripePayments (~> 23.2.0)
- StripePaymentSheet (~> 23.2.0)
- StripePaymentsUI (~> 23.2.0)
- stripe-react-native/Tests (0.20.0):
- stripe-react-native/Tests (0.21.0):
- React-Core
- Stripe (~> 23.2.0)
- StripeApplePay (~> 23.2.0)
Expand Down Expand Up @@ -637,7 +637,7 @@ SPEC CHECKSUMS:
RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
Stripe: cc895392856dc7f401119a612e31f020b97cb8d1
stripe-react-native: 0aafc0344b8846d1a35f1cdc56c03aa5da878208
stripe-react-native: febc743cbd836030519cb3a0e53b858e06225f44
StripeApplePay: 7e43d6b4b9f18e922ba683e549f199a4f6db6fde
StripeCore: 6da916796f87ab91f3dae1d78a93602465964cbc
StripeFinancialConnections: 312fbe670871c7a3227dce0e092d7d5bf209f75e
Expand Down