bring branch up to date

example/android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,9 +22,7 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+
 
 android {
     namespace 'com.flutter.stripe.example'
@@ -65,7 +64,6 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.7.0'
     implementation 'com.google.android.gms:play-services-wallet:19.1.0'
     androidTestImplementation 'androidx.test:runner:1.2.0'

example/android/build.gradle

@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.8.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Nov 13 19:26:48 WET 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

example/android/settings.gradle

@@ -1,11 +1,25 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.5.1" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.10" apply false
+}
+
+include ":app"

example/pubspec.yaml

@@ -12,11 +12,11 @@ dependencies:
     sdk: flutter
   flutter_stripe: ^10.2.0
   flutter_stripe_web: ^5.1.0
-  pay: ^1.1.0
+  pay: ^2.0.0
   http: ^1.1.0
   font_awesome_flutter: ^10.6.0
   platform: ^3.0.0
-  web: ^0.5.1
+  web: ^1.0.0
 
 dev_dependencies:
   integration_test:

packages/stripe/lib/src/stripe.dart

@@ -141,7 +141,7 @@ class Stripe {
     return isSupported;
   }
 
-  /// Laucnhes the relevant native wallsheet (Apple Pay on iOS and Google Pay on Android)
+  /// Launches the relevant native wallsheet (Apple Pay on iOS and Google Pay on Android)
   /// in order to create a payment intent
   ///
   /// Argument [params] is describing the the Apple Pay or Google pay configuration.

packages/stripe/lib/src/widgets/apple_pay_button.dart

@@ -14,7 +14,7 @@ const double _kApplePayButtonDefaultHeight = 48;
 
 class ApplePayButton extends StatelessWidget {
   ApplePayButton({
-    Key? key,
+    super.key,
     this.style = PlatformButtonStyle.automatic,
     this.type = PlatformButtonType.plain,
     this.cornerRadius = 4,
@@ -30,8 +30,7 @@ class ApplePayButton extends StatelessWidget {
         constraints = (width != null || height != null)
             ? constraints?.tighten(width: width, height: height) ??
                 BoxConstraints.tightFor(width: width, height: height)
-            : constraints,
-        super(key: key);
+            : constraints;
 
   /// Style of the the apple payment button.
   ///
@@ -113,7 +112,6 @@ class ApplePayButton extends StatelessWidget {
 
 class _UiKitApplePayButton extends StatefulWidget {
   const _UiKitApplePayButton({
-    Key? key,
     required this.style,
     required this.type,
     this.cornerRadius = 4,
@@ -122,7 +120,7 @@ class _UiKitApplePayButton extends StatefulWidget {
     this.onCouponCodeEntered,
     this.onShippingMethodSelected,
     this.onOrderTracking,
-  }) : super(key: key);
+  });
 
   final PlatformButtonStyle style;
   final PlatformButtonType type;

packages/stripe/lib/src/widgets/aubecs_debit_form.dart

@@ -11,8 +11,8 @@ class AubecsFormField extends StatelessWidget {
     this.style,
     this.companyName,
     this.controller,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -36,8 +36,7 @@ class _AubecsFormField extends StatefulWidget {
     this.style,
     this.companyName,
     this.controller,
-    Key? key,
-  }) : super(key: key);
+  });
 
   @override
   _AubecsFormFieldState createState() => _AubecsFormFieldState();

packages/stripe/lib/src/widgets/card_field.dart

@@ -14,7 +14,7 @@ import 'keep_visible_on_focus.dart';
 class CardField extends StatefulWidget {
   const CardField({
     this.onCardChanged,
-    Key? key,
+    super.key,
     this.onFocus,
     this.decoration,
     this.enablePostalCode = false,
@@ -33,7 +33,7 @@ class CardField extends StatefulWidget {
     this.preferredNetworks,
     this.androidPlatformViewRenderType =
         AndroidPlatformViewRenderType.expensiveAndroidView,
-  }) : super(key: key);
+  });
 
   /// Decoration related to the input fields.
   final InputDecoration? decoration;
@@ -282,7 +282,6 @@ class _MethodChannelCardField extends StatefulWidget {
     this.onCardChanged,
     required this.controller,
     required this.androidPlatformViewRenderType,
-    Key? key,
     this.onFocus,
     this.style,
     this.placeholder,
@@ -301,8 +300,7 @@ class _MethodChannelCardField extends StatefulWidget {
         constraints = (width != null || height != null)
             ? constraints?.tighten(width: width, height: height) ??
                 BoxConstraints.tightFor(width: width, height: height)
-            : constraints,
-        super(key: key);
+            : constraints;
 
   final BoxConstraints? constraints;
   final CardFocusCallback? onFocus;
@@ -613,12 +611,12 @@ class _MethodChannelCardFieldState extends State<_MethodChannelCardField>
 
 class _AndroidCardField extends StatelessWidget {
   const _AndroidCardField({
-    Key? key,
     required this.viewType,
     required this.creationParams,
     required this.onPlatformViewCreated,
     required this.androidPlatformViewRenderType,
-  }) : super(key: key);
+    super.key,
+  });
 
   final AndroidPlatformViewRenderType androidPlatformViewRenderType;
   final String viewType;
@@ -673,11 +671,11 @@ class _AndroidCardField extends StatelessWidget {
 
 class _UiKitCardField extends StatelessWidget {
   const _UiKitCardField({
-    Key? key,
     required this.viewType,
     required this.creationParams,
     required this.onPlatformViewCreated,
-  }) : super(key: key);
+    super.key,
+  });
 
   final String viewType;
   final Map<String, dynamic> creationParams;

packages/stripe/lib/src/widgets/card_form_field.dart

@@ -20,7 +20,6 @@ import 'keep_visible_on_focus.dart';
 class CardFormField extends StatefulWidget {
   const CardFormField({
     this.onCardChanged,
-    Key? key,
     this.onFocus,
     this.enablePostalCode = true,
     this.countryCode,
@@ -31,7 +30,8 @@ class CardFormField extends StatefulWidget {
     this.disabled = false,
     this.controller,
     this.preferredNetworks,
-  }) : super(key: key);
+    super.key,
+  });
 
   /// Callback that will be executed when a specific field gets focus.
   final CardFocusCallback? onFocus;
@@ -216,7 +216,6 @@ class _MethodChannelCardFormField extends StatefulWidget {
   _MethodChannelCardFormField({
     this.onCardChanged,
     required this.controller,
-    Key? key,
     this.onFocus,
     this.style,
     this.enablePostalCode = true,
@@ -234,8 +233,7 @@ class _MethodChannelCardFormField extends StatefulWidget {
         constraints = (width != null || height != null)
             ? constraints?.tighten(width: width, height: height) ??
                 BoxConstraints.tightFor(width: width, height: height)
-            : constraints,
-        super(key: key);
+            : constraints;
 
   final BoxConstraints? constraints;
   final CardFocusCallback? onFocus;
@@ -526,11 +524,11 @@ class _MethodChannelCardFormFieldState
 
 class _AndroidCardFormField extends StatelessWidget {
   const _AndroidCardFormField({
-    Key? key,
     required this.viewType,
     required this.creationParams,
     required this.onPlatformViewCreated,
-  }) : super(key: key);
+    super.key,
+  });
 
   final String viewType;
   final Map<String, dynamic> creationParams;
@@ -568,11 +566,11 @@ class _AndroidCardFormField extends StatelessWidget {
 
 class _UiKitCardFormField extends StatelessWidget {
   const _UiKitCardFormField({
-    Key? key,
     required this.viewType,
     required this.creationParams,
     required this.onPlatformViewCreated,
-  }) : super(key: key);
+    super.key,
+  });
 
   final String viewType;
   final Map<String, dynamic> creationParams;

packages/stripe/lib/src/widgets/google_pay_button.dart

@@ -12,8 +12,8 @@ class GooglePayButton extends StatefulWidget {
     this.buttonType = PlatformButtonType.pay,
     this.borderRadius,
     this.appearance = PlatformButtonStyle.automatic,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   static const _viewType = 'flutter.stripe/google_pay_button';
 

packages/stripe/lib/src/widgets/keep_visible_on_focus.dart

@@ -3,10 +3,10 @@ import 'package:flutter/widgets.dart';
 
 class KeepVisibleOnFocus extends StatefulWidget {
   const KeepVisibleOnFocus({
-    Key? key,
     required this.focusNode,
     required this.child,
-  }) : super(key: key);
+    super.key,
+  });
 
   final FocusNode focusNode;
 

packages/stripe/pubspec.yaml

@@ -28,4 +28,4 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^2.0.1
+  flutter_lints: ^4.0.0

packages/stripe_android/android/src/main/kotlin/com/flutter/stripe/StripeSdkGooglePayButtonPlatformView.kt

@@ -38,9 +38,6 @@ class StripeSdkGooglePayButtonPlatformView(
             googlePayButtonManager.borderRadius(payButton, creationParams["borderRadius"] as Int)
         }
         payButton.initialize()
-        payButton.getChildAt(0).setOnClickListener {
-            channel.invokeMethod("onPressed", null)
-        }
     }
 
     override fun getView(): View {
@@ -53,5 +50,12 @@ class StripeSdkGooglePayButtonPlatformView(
 
     override fun onFlutterViewAttached(flutterView: View) {
         googlePayButtonManager.onAfterUpdateTransaction(payButton)
+
+        // wait until view is attached to the view hierarchy
+        payButton.post {
+            (payButton.parent as View).setOnClickListener {
+                channel.invokeMethod("onPressed", null)
+            }
+        };
     }
 }

packages/stripe_android/pubspec.yaml

@@ -15,7 +15,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^1.0.3
+  flutter_lints: ^4.0.0
 
 flutter:
   plugin:

packages/stripe_ios/pubspec.yaml

@@ -15,7 +15,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^1.0.3
+  flutter_lints: ^4.0.0
 
 flutter:
   plugin:

packages/stripe_js/lib/src/js/elements/element_creation_options.dart

@@ -9,12 +9,14 @@ extension type JsElementsCreateOptions._(JSObject o) {
     String? locale,
     String? clientSecret,
     JsElementAppearance? appearance,
+    String? customerSessionClientSecret,
     String loader,
   });
 
   external JSArray<Font> fonts;
   external String locale;
   external String clientSecret;
+  external String customerSessionClientSecret;
   external JsElementAppearance appearance;
 }