feat(payment): update stripeAdnroidVersion to currently

note: v20.37.2 updated dependencies
capacitor-community · Mar 7, 2024 · ed14305 · ed14305
1 parent a946aed
commit ed14305
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 42 deletions.
diff --git a/demo/sdk-fixed/android/app/capacitor.build.gradle b/demo/sdk-fixed/android/app/capacitor.build.gradle
@@ -11,7 +11,6 @@ apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
     implementation project(':capacitor-community-stripe')
     implementation project(':capacitor-community-stripe-identity')
-    implementation project(':capacitor-community-stripe-terminal')
 
 }
 

diff --git a/demo/sdk-fixed/android/app/src/main/java/io/ionic/starter/MainActivity.java b/demo/sdk-fixed/android/app/src/main/java/io/ionic/starter/MainActivity.java
@@ -5,7 +5,6 @@
 import com.getcapacitor.BridgeActivity;
 import com.getcapacitor.community.stripe.StripePlugin;
 import com.getcapacitor.community.stripe.identity.StripeIdentityPlugin;
-import com.getcapacitor.community.stripe.terminal.StripeTerminalPlugin;
 
 public class MainActivity extends BridgeActivity {
 
@@ -14,8 +13,5 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         registerPlugin(StripePlugin.class);
         registerPlugin(StripeIdentityPlugin.class);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-          registerPlugin(StripeTerminalPlugin.class);
-        }
     }
 }
diff --git a/demo/sdk-fixed/android/capacitor.settings.gradle b/demo/sdk-fixed/android/capacitor.settings.gradle
@@ -7,6 +7,3 @@ project(':capacitor-community-stripe').projectDir = new File('../../../packages/
 
 include ':capacitor-community-stripe-identity'
 project(':capacitor-community-stripe-identity').projectDir = new File('../../../packages/identity/android')
-
-include ':capacitor-community-stripe-terminal'
-project(':capacitor-community-stripe-terminal').projectDir = new File('../../../packages/terminal/android')
diff --git a/demo/sdk-fixed/android/variables.gradle b/demo/sdk-fixed/android/variables.gradle
@@ -1,16 +1,16 @@
 ext {
-    minSdkVersion = 26
-    compileSdkVersion = 34
-    targetSdkVersion = 33
-    androidxActivityVersion = '1.7.0'
-    androidxAppCompatVersion = '1.6.1'
-    androidxCoordinatorLayoutVersion = '1.2.0'
-    androidxCoreVersion = '1.10.0'
-    androidxFragmentVersion = '1.5.6'
-    coreSplashScreenVersion = '1.0.0'
-    androidxWebkitVersion = '1.6.1'
-    junitVersion = '4.13.2'
-    androidxJunitVersion = '1.1.5'
-    androidxEspressoCoreVersion = '3.5.1'
-    cordovaAndroidVersion = '10.1.1'
+  minSdkVersion = 22
+  compileSdkVersion = 33
+  targetSdkVersion = 33
+  androidxActivityVersion = '1.7.0'
+  androidxAppCompatVersion = '1.6.1'
+  androidxCoordinatorLayoutVersion = '1.2.0'
+  androidxCoreVersion = '1.10.0'
+  androidxFragmentVersion = '1.5.6'
+  coreSplashScreenVersion = '1.0.0'
+  androidxWebkitVersion = '1.6.1'
+  junitVersion = '4.13.2'
+  androidxJunitVersion = '1.1.5'
+  androidxEspressoCoreVersion = '3.5.1'
+  cordovaAndroidVersion = '10.1.1'
 }
diff --git a/demo/sdk-fixed/ios/App/Podfile b/demo/sdk-fixed/ios/App/Podfile
@@ -13,7 +13,6 @@ def capacitor_pods
   pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
   pod 'CapacitorCommunityStripe', :path => '../../../../packages/payment'
   pod 'CapacitorCommunityStripeIdentity', :path => '../../../../packages/identity'
-  pod 'CapacitorCommunityStripeTerminal', :path => '../../../../packages/terminal'
 end
 
 target 'App' do

diff --git a/demo/sdk-fixed/ios/App/Podfile.lock b/demo/sdk-fixed/ios/App/Podfile.lock
@@ -1,16 +1,13 @@
 PODS:
   - Capacitor (5.0.0):
     - CapacitorCordova
-  - CapacitorCommunityStripe (5.4.2):
+  - CapacitorCommunityStripe (5.4.3):
     - Capacitor
     - StripeApplePay (~> 23.23.0)
     - StripePaymentSheet (~> 23.23.0)
-  - CapacitorCommunityStripeIdentity (5.4.2):
+  - CapacitorCommunityStripeIdentity (5.4.3):
     - Capacitor
     - StripeIdentity (~> 23.23.0)
-  - CapacitorCommunityStripeTerminal (5.4.2):
-    - Capacitor
-    - StripeTerminal (~> 3.3.1)
   - CapacitorCordova (5.0.0)
   - StripeApplePay (23.23.0):
     - StripeCore (= 23.23.0)
@@ -35,15 +32,13 @@ PODS:
     - StripeCore (= 23.23.0)
     - StripePayments (= 23.23.0)
     - StripeUICore (= 23.23.0)
-  - StripeTerminal (3.3.1)
   - StripeUICore (23.23.0):
     - StripeCore (= 23.23.0)
 
 DEPENDENCIES:
   - "Capacitor (from `../../node_modules/@capacitor/ios`)"
   - CapacitorCommunityStripe (from `../../../../packages/payment`)
   - CapacitorCommunityStripeIdentity (from `../../../../packages/identity`)
-  - CapacitorCommunityStripeTerminal (from `../../../../packages/terminal`)
   - "CapacitorCordova (from `../../node_modules/@capacitor/ios`)"
 
 SPEC REPOS:
@@ -55,7 +50,6 @@ SPEC REPOS:
     - StripePayments
     - StripePaymentSheet
     - StripePaymentsUI
-    - StripeTerminal
     - StripeUICore
 
 EXTERNAL SOURCES:
@@ -65,16 +59,13 @@ EXTERNAL SOURCES:
     :path: "../../../../packages/payment"
   CapacitorCommunityStripeIdentity:
     :path: "../../../../packages/identity"
-  CapacitorCommunityStripeTerminal:
-    :path: "../../../../packages/terminal"
   CapacitorCordova:
     :path: "../../node_modules/@capacitor/ios"
 
 SPEC CHECKSUMS:
   Capacitor: b332cb737d447561e854039fb72195206685dce2
-  CapacitorCommunityStripe: da7a0bc7f0417ba9482ee9707d096fa70ff777a2
-  CapacitorCommunityStripeIdentity: 7ee0e0f0745c018e712dde3de434a4b3e1eb8ec8
-  CapacitorCommunityStripeTerminal: 126dc0bf8472785ee2fbfc120a5b568dc88f332b
+  CapacitorCommunityStripe: 20f7e29799a5b2a35f54e9ae229ba47961957a10
+  CapacitorCommunityStripeIdentity: e23b53fcb003223c6c17bd1d5f398cd317e066c8
   CapacitorCordova: 4ea17670ee562680988a7ce9db68dee5160fe564
   StripeApplePay: dc5c1ff53862cd4facac23329d8755e8193e0e01
   StripeCameraCore: a176389efcd873a9f0f49bc54731d023e28ee2d6
@@ -83,9 +74,8 @@ SPEC CHECKSUMS:
   StripePayments: 4271ec12eb1530336b8b6c1ae96483c9c4def931
   StripePaymentSheet: f213e149b1ec43b8ab84bbb5b29a7df0152601ad
   StripePaymentsUI: 5fd5a2f69e604e8b7352d4c0a51f25a81012cfba
-  StripeTerminal: 369ef0cf0b90d838f42be1a0b371475986f4b79f
   StripeUICore: cbe12b4d0602666986e9699322b4b09e07eeb4da
 
-PODFILE CHECKSUM: 2430ef1d0136ea2c0f7e2696daff19ed8cd27595
+PODFILE CHECKSUM: e631e98a4179b91c569cf7262a36fbf149b734b6
 
 COCOAPODS: 1.13.0
diff --git a/packages/identity/android/build.gradle b/packages/identity/android/build.gradle
@@ -67,6 +67,11 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    implementation "com.stripe:identity:$identityVersion"
+    implementation("com.stripe:identity:$identityVersion") {
+        exclude group: 'androidx.emoji2', module: 'emoji2'
+    }
+    // Avoid using 1.4.0 since that requires targetSdkVersion 34
+    implementation('androidx.emoji2:emoji2:1.3.0').force
+
     implementation "com.google.android.gms:play-services-wallet:$playServicesWalletVersion"
 }
diff --git a/packages/payment/android/build.gradle b/packages/payment/android/build.gradle
@@ -5,7 +5,7 @@ ext {
     androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
 
     playServicesWalletVersion = project.hasProperty('playServicesWalletVersion') ? rootProject.ext.playServicesWalletVersion : '19.2.+'
-    stripeAndroidVersion = project.hasProperty('stripeAndroidVersion') ? rootProject.ext.stripeAndroidVersion : '20.31.+'
+    stripeAndroidVersion = project.hasProperty('stripeAndroidVersion') ? rootProject.ext.stripeAndroidVersion : '20.37.1'
     gsonVersion = project.hasProperty('gsonVersion') ? rootProject.ext.gsonVersion : '2.10.+'
 }
 
@@ -68,7 +68,12 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    implementation "com.stripe:stripe-android:$stripeAndroidVersion"
-    implementation "com.google.android.gms:play-services-wallet:$playServicesWalletVersion"
+    implementation("com.stripe:stripe-android:$stripeAndroidVersion") {
+        exclude group: 'androidx.emoji2', module: 'emoji2'
+    }
+    // Avoid using 1.4.0 since that requires targetSdkVersion 34
+    implementation('androidx.emoji2:emoji2:1.3.0').force
+
     implementation "com.google.code.gson:gson:$gsonVersion"
+    implementation "com.google.android.gms:play-services-wallet:$playServicesWalletVersion"
 }