Merge 4.7 main into simpro-kotlin

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: node_modules
-        key: ${{ runner.os }}-node-${{ steps.setup_node.outputs.node-version }}-npm-${{ hashFiles('**/package-lock.json') }}-v1
+        key: ${{ runner.os }}-node-${{ steps.setup_node.outputs.node-version }}-npm-${{ hashFiles('**/package-lock.json') }}-v2
 
     - name: Build Payment package
       run: npm install && npm run build
@@ -57,7 +57,7 @@ jobs:
 
     - name: Build Android Debug APK
       working-directory: ./demo/angular/android
-      run: ./gradlew assembleDebug
+      run: ./gradlew assembleDebug --stacktrace
 
     - name: Upload a Build Artifact
       uses: actions/upload-artifact@v4
@@ -138,7 +138,7 @@ jobs:
         working-directory: ./packages/terminal
 
   verify-payment-ios:
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
@@ -157,7 +157,7 @@ jobs:
         working-directory: ./packages/payment
 
   verify-identity-ios:
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
@@ -176,7 +176,7 @@ jobs:
         working-directory: ./packages/identity
 
   verify-terminal-ios:
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3

README.md

@@ -91,8 +91,8 @@ To use the latest Stripe Android, you need to version these up. To use the lates
 +   identityVersion = '21.3.+'
 
     // If you use @simPRO-Software/stripe-terminal:
-+   stripeterminalCoreVersion = '4.1.0'
-+   stripeterminalTapToPayVersion = '4.1.0'
++   stripeterminalCoreVersion = '4.5.0'
++   stripeterminalTapToPayVersion = '4.5.0'
   }
 ```
 

demo/angular/android/app/src/main/assets/capacitor.config.json

@@ -1,6 +1,5 @@
 {
 	"appId": "io.ionic.starter",
 	"appName": "capacitor-stripe",
-	"webDir": "www/browser",
-	"bundledWebRuntime": false
+	"webDir": "www/browser"
 }

demo/angular/angular.json

@@ -11,7 +11,7 @@
             "prefix": "app",
             "architect": {
                 "build": {
-                    "builder": "@angular-devkit/build-angular:application",
+                    "builder": "@angular/build:application",
                     "options": {
                         "outputPath": "www",
                         "index": "src/index.html",
@@ -71,7 +71,7 @@
                     "defaultConfiguration": "production"
                 },
                 "serve": {
-                    "builder": "@angular-devkit/build-angular:dev-server",
+                    "builder": "@angular/build:dev-server",
                     "configurations": {
                         "production": {
                             "buildTarget": "app:build:production"
@@ -86,13 +86,13 @@
                     "defaultConfiguration": "development"
                 },
                 "extract-i18n": {
-                    "builder": "@angular-devkit/build-angular:extract-i18n",
+                    "builder": "@angular/build:extract-i18n",
                     "options": {
                         "buildTarget": "app:build"
                     }
                 },
                 "test": {
-                    "builder": "@angular-devkit/build-angular:karma",
+                    "builder": "@angular/build:karma",
                     "options": {
                         "main": "src/test.ts",
                         "polyfills": "src/polyfills.ts",
@@ -148,6 +148,30 @@
         },
         "@ionic/angular-toolkit:page": {
             "styleext": "scss"
+        },
+        "@schematics/angular:component": {
+          "type": "component"
+        },
+        "@schematics/angular:directive": {
+          "type": "directive"
+        },
+        "@schematics/angular:service": {
+          "type": "service"
+        },
+        "@schematics/angular:guard": {
+          "typeSeparator": "."
+        },
+        "@schematics/angular:interceptor": {
+          "typeSeparator": "."
+        },
+        "@schematics/angular:module": {
+          "typeSeparator": "."
+        },
+        "@schematics/angular:pipe": {
+          "typeSeparator": "."
+        },
+        "@schematics/angular:resolver": {
+          "typeSeparator": "."
         }
     }
 }

demo/angular/ios/App/App/capacitor.config.json

@@ -2,7 +2,6 @@
 	"appId": "io.ionic.starter",
 	"appName": "capacitor-stripe",
 	"webDir": "www/browser",
-	"bundledWebRuntime": false,
 	"packageClassList": [
 		"StripePlugin",
 		"StripeIdentityPlugin",

demo/angular/ios/App/Podfile.lock

@@ -0,0 +1,91 @@
+PODS:
+  - Capacitor (7.0.1):
+    - CapacitorCordova
+  - CapacitorCommunityStripe (7.2.1):
+    - Capacitor
+    - StripeApplePay (~> 25.1.0)
+    - StripePaymentSheet (~> 25.1.0)
+  - CapacitorCommunityStripeIdentity (7.2.1):
+    - Capacitor
+    - StripeIdentity (~> 25.1.0)
+  - CapacitorCommunityStripeTerminal (7.2.1):
+    - Capacitor
+    - StripeTerminal (= 4.7.3)
+  - CapacitorCordova (7.0.1)
+  - StripeApplePay (25.1.0):
+    - StripeCore (= 25.1.0)
+  - StripeCameraCore (25.1.0):
+    - StripeCore (= 25.1.0)
+  - StripeCore (25.1.0)
+  - StripeIdentity (25.1.0):
+    - StripeCameraCore (= 25.1.0)
+    - StripeCore (= 25.1.0)
+    - StripeUICore (= 25.1.0)
+  - StripePayments (25.1.0):
+    - StripeCore (= 25.1.0)
+    - StripePayments/Stripe3DS2 (= 25.1.0)
+  - StripePayments/Stripe3DS2 (25.1.0):
+    - StripeCore (= 25.1.0)
+  - StripePaymentSheet (25.1.0):
+    - StripeApplePay (= 25.1.0)
+    - StripeCore (= 25.1.0)
+    - StripePayments (= 25.1.0)
+    - StripePaymentsUI (= 25.1.0)
+  - StripePaymentsUI (25.1.0):
+    - StripeCore (= 25.1.0)
+    - StripePayments (= 25.1.0)
+    - StripeUICore (= 25.1.0)
+  - StripeTerminal (4.7.3)
+  - StripeUICore (25.1.0):
+    - StripeCore (= 25.1.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:
+  trunk:
+    - StripeApplePay
+    - StripeCameraCore
+    - StripeCore
+    - StripeIdentity
+    - StripePayments
+    - StripePaymentSheet
+    - StripePaymentsUI
+    - StripeTerminal
+    - StripeUICore
+
+EXTERNAL SOURCES:
+  Capacitor:
+    :path: "../../node_modules/@capacitor/ios"
+  CapacitorCommunityStripe:
+    :path: "../../../../packages/payment"
+  CapacitorCommunityStripeIdentity:
+    :path: "../../../../packages/identity"
+  CapacitorCommunityStripeTerminal:
+    :path: "../../../../packages/terminal"
+  CapacitorCordova:
+    :path: "../../node_modules/@capacitor/ios"
+
+SPEC CHECKSUMS:
+  Capacitor: de199cba6c8b20995428ad0b7cb0bc6ca625ffd4
+  CapacitorCommunityStripe: 684052203ba8abd2cf74b464df0603ab3e6e464d
+  CapacitorCommunityStripeIdentity: f8dbf6be3961097ba7b3075258776bccc3ec2f81
+  CapacitorCommunityStripeTerminal: 23da4329032aa23d3bc40b630a36dc978f664496
+  CapacitorCordova: 63d476958d5022d76f197031e8b7ea3519988c64
+  StripeApplePay: baa0634219c168df6a50c7d76ae0d9bff39dbaf9
+  StripeCameraCore: e12d90fd62abcf5a1cb9bb8a85d72e5cbb7e7666
+  StripeCore: 6078969b9c9b205081bc8d66991e2a6d4bd3e994
+  StripeIdentity: 7d40804f948a38e6c99fa53d0400a3d955758a00
+  StripePayments: b80892b98f25f4ee890773755f2940727aefcb57
+  StripePaymentSheet: 77673b324a5cc5c9327f5c8cfcdf13d2f6495dde
+  StripePaymentsUI: 057811da34b69e89a06ec1962fffe4247b98ee92
+  StripeTerminal: b9e92913da8a08ff5c62af75056ad39bf8b02ac6
+  StripeUICore: 4f47fdd3895f23c6e02879ef27126f62af7058ff
+
+PODFILE CHECKSUM: c75ca255b97ee461832b20e6cdf6d1da533d4019
+
+COCOAPODS: 1.16.2

demo/angular/karma.conf.js

@@ -10,7 +10,7 @@ module.exports = function (config) {
       require('karma-chrome-launcher'),
       require('karma-jasmine-html-reporter'),
       require('karma-coverage'),
-      require('@angular-devkit/build-angular/plugins/karma')
+
     ],
     client: {
       jasmine: {

demo/angular/package.json

@@ -15,52 +15,50 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/common": "^18.2.10",
-    "@angular/core": "^18.2.10",
-    "@angular/forms": "^18.2.10",
-    "@angular/platform-browser": "^18.2.10",
-    "@angular/platform-browser-dynamic": "^18.2.10",
-    "@angular/router": "^18.2.10",
+    "@angular/common": "^20.3.12",
+    "@angular/core": "^20.3.12",
+    "@angular/forms": "^20.3.12",
+    "@angular/platform-browser": "^20.3.12",
+    "@angular/platform-browser-dynamic": "^20.3.12",
+    "@angular/router": "^20.3.12",
     "@capacitor-community/stripe": "file:../../packages/payment",
     "@capacitor-community/stripe-identity": "file:../../packages/identity",
-    "@simPRO-Software/stripe-terminal": "file:../../packages/terminal",
-    "@capacitor/android": "^6.0.0",
-    "@capacitor/core": "^6.0.0",
-    "@capacitor/ios": "^6.0.0",
-    "@ionic/angular": "^8.2.6",
+    "@capacitor-community/stripe-terminal": "file:../../packages/terminal",
+    "@capacitor/android": "^7.0.0",
+    "@capacitor/core": "^7.0.0",
+    "@capacitor/ios": "^7.0.0",
+    "@ionic/angular": "^8.7.3",
     "rxjs": "~7.5.0",
     "stripe-pwa-elements": "^2.1.0",
     "tslib": "^2.3.0",
     "zone.js": "~0.14.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^18.2.11",
-    "@angular-eslint/builder": "~18.4.0",
-    "@angular-eslint/eslint-plugin": "~18.4.0",
-    "@angular-eslint/eslint-plugin-template": "~18.4.0",
-    "@angular-eslint/schematics": "~18.4.0",
-    "@angular-eslint/template-parser": "~18.4.0",
-    "@angular/cli": "^18.2.11",
-    "@angular/compiler": "^18.2.10",
-    "@angular/compiler-cli": "^18.2.10",
-    "@angular/language-service": "^18.2.10",
-    "@capacitor/cli": "6.0.0",
+    "@angular/build": "^20.3.10",
+    "@angular/cli": "^20.3.10",
+    "@angular/compiler": "^20.3.12",
+    "@angular/compiler-cli": "^20.3.12",
+    "@angular/language-service": "^20.3.12",
+    "@capacitor/cli": "^7.0.0",
+    "@eslint/eslintrc": "^3.3.1",
+    "@eslint/js": "^9.25.1",
     "@ionic/angular-toolkit": "^10.0.0",
     "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
-    "@types/node": "^12.11.1",
-    "eslint": "^9.23.0",
-    "jasmine-core": "~3.8.0",
+    "angular-eslint": "20.6.0",
+    "eslint": "^9.28.0",
+    "jasmine-core": "~4.6.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~6.3.16",
-    "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage": "~2.0.3",
+    "karma": "^6.4.0",
+    "karma-chrome-launcher": "~3.2.0",
+    "karma-coverage": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
-    "karma-jasmine": "~4.0.0",
-    "karma-jasmine-html-reporter": "^1.5.0",
+    "karma-jasmine": "~5.1.0",
+    "karma-jasmine-html-reporter": "~2.1.0",
     "prettier": "^3.5.3",
     "protractor": "~7.0.0",
-    "typescript": "~5.4.3"
+    "typescript": "5.8.3",
+    "typescript-eslint": "^8.33.1"
   },
   "description": "An Ionic project"
 }

demo/angular/src/app/demo/demo.page.ts

@@ -1,5 +1,6 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
 import {
+  Address,
   ApplePayEventsEnum,
   CreatePaymentSheetOption,
   GooglePayEventsEnum,
@@ -38,14 +39,19 @@ import {
   ],
 })
 export class DemoPage implements OnInit {
+  private http = inject(HttpClient);
+
   processSheet: 'willReady' | 'Ready' = 'willReady';
   processFlow: 'willReady' | 'Ready' | 'canConfirm' = 'willReady';
   processApplePay: 'willReady' | 'Ready' = 'willReady';
   processGooglePay: 'willReady' | 'Ready' = 'willReady';
   isApplePayAvailable = false;
   isGooglePayAvailable = false;
 
-  constructor(private http: HttpClient) {}
+  /** Inserted by Angular inject() migration for backwards compatibility */
+  constructor(...args: unknown[]);
+
+  constructor() {}
 
   async ngOnInit() {
     Stripe.addListener(PaymentSheetEventsEnum.Loaded, () => {
@@ -192,6 +198,25 @@ export class DemoPage implements OnInit {
         customerEphemeralKeySecret: ephemeralKey,
         customerId: customer,
         merchantDisplayName: 'rdlabo',
+        billingDetailsCollectionConfiguration: {
+          email: 'always',
+          name: 'always',
+          phone: 'always',
+          address: 'full',
+        },
+        defaultBillingDetails: {
+          email: 'info@example.com',
+          name: 'Masahiko Sakakibara',
+          phone: '+15551234567',
+          address: {
+            city: 'San Francisco',
+            country: 'US',
+            line1: '123 Market St',
+            line2: '',
+            postalCode: '94107',
+            state: 'CA',
+          }
+        }
       });
     } else {
       const { paymentIntent } = await firstValueFrom(