From dfc3fc731c12d0ca998e50c83d460d786c1ebf36 Mon Sep 17 00:00:00 2001 From: Remon Date: Wed, 29 Nov 2023 20:31:27 +0000 Subject: [PATCH 1/4] Doc: add requirement for android gradle plugin to readme --- README.md | 9 +++++---- packages/stripe/README.md | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index f02a86864..07e1dc3d8 100644 --- a/README.md +++ b/README.md @@ -48,10 +48,11 @@ This plugin requires several changes to be able to work on Android devices. Plea 1. Use Android 5.0 (API level 21) and above 2. Use Kotlin version 1.5.0 and above: [example](https://github.com/flutter-stripe/flutter_stripe/blob/79b201a2e9b827196d6a97bb41e1d0e526632a5a/example/android/.gradle#L2) -3. Using a descendant of `Theme.AppCompat` for your activity: [example](https://github.com/flutter-stripe/flutter_stripe/blob/main/example/android/app/src/main/res/values/styles.xml#L15), [example night theme](https://github.com/flutter-stripe/flutter_stripe/blob/main/example/android/app/src/main/res/values-night/styles.xml#L16) -4. Using an up-to-date Android gradle build tools version: [example](https://github.com/flutter-stripe/flutter_stripe/blob/main/example/android/build.gradle#L9) and an up-to-date gradle version accordingly: [example](https://github.com/flutter-stripe/flutter_stripe/blob/main/example/android/gradle/wrapper/gradle-wrapper.properties#L6) -5. Using `FlutterFragmentActivity` instead of `FlutterActivity` in `MainActivity.kt`: [example](https://github.com/flutter-stripe/flutter_stripe/blob/79b201a2e9b827196d6a97bb41e1d0e526632a5a/example/android/app/src/main/kotlin/com/flutter/stripe/example/MainActivity.kt#L6) -6. Rebuild the app, as the above changes don't update with hot reload +3. Requires Android Gradle plugin 8 and higher +4. Using a descendant of `Theme.AppCompat` for your activity: [example](https://github.com/flutter-stripe/flutter_stripe/blob/main/example/android/app/src/main/res/values/styles.xml#L15), [example night theme](https://github.com/flutter-stripe/flutter_stripe/blob/main/example/android/app/src/main/res/values-night/styles.xml#L16) +5. Using an up-to-date Android gradle build tools version: [example](https://github.com/flutter-stripe/flutter_stripe/blob/main/example/android/build.gradle#L9) and an up-to-date gradle version accordingly: [example](https://github.com/flutter-stripe/flutter_stripe/blob/main/example/android/gradle/wrapper/gradle-wrapper.properties#L6) +6. Using `FlutterFragmentActivity` instead of `FlutterActivity` in `MainActivity.kt`: [example](https://github.com/flutter-stripe/flutter_stripe/blob/79b201a2e9b827196d6a97bb41e1d0e526632a5a/example/android/app/src/main/kotlin/com/flutter/stripe/example/MainActivity.kt#L6) +7. 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 diff --git a/packages/stripe/README.md b/packages/stripe/README.md index f02a86864..07e1dc3d8 100644 --- a/packages/stripe/README.md +++ b/packages/stripe/README.md @@ -48,10 +48,11 @@ This plugin requires several changes to be able to work on Android devices. Plea 1. Use Android 5.0 (API level 21) and above 2. Use Kotlin version 1.5.0 and above: [example](https://github.com/flutter-stripe/flutter_stripe/blob/79b201a2e9b827196d6a97bb41e1d0e526632a5a/example/android/.gradle#L2) -3. Using a descendant of `Theme.AppCompat` for your activity: [example](https://github.com/flutter-stripe/flutter_stripe/blob/main/example/android/app/src/main/res/values/styles.xml#L15), [example night theme](https://github.com/flutter-stripe/flutter_stripe/blob/main/example/android/app/src/main/res/values-night/styles.xml#L16) -4. Using an up-to-date Android gradle build tools version: [example](https://github.com/flutter-stripe/flutter_stripe/blob/main/example/android/build.gradle#L9) and an up-to-date gradle version accordingly: [example](https://github.com/flutter-stripe/flutter_stripe/blob/main/example/android/gradle/wrapper/gradle-wrapper.properties#L6) -5. Using `FlutterFragmentActivity` instead of `FlutterActivity` in `MainActivity.kt`: [example](https://github.com/flutter-stripe/flutter_stripe/blob/79b201a2e9b827196d6a97bb41e1d0e526632a5a/example/android/app/src/main/kotlin/com/flutter/stripe/example/MainActivity.kt#L6) -6. Rebuild the app, as the above changes don't update with hot reload +3. Requires Android Gradle plugin 8 and higher +4. Using a descendant of `Theme.AppCompat` for your activity: [example](https://github.com/flutter-stripe/flutter_stripe/blob/main/example/android/app/src/main/res/values/styles.xml#L15), [example night theme](https://github.com/flutter-stripe/flutter_stripe/blob/main/example/android/app/src/main/res/values-night/styles.xml#L16) +5. Using an up-to-date Android gradle build tools version: [example](https://github.com/flutter-stripe/flutter_stripe/blob/main/example/android/build.gradle#L9) and an up-to-date gradle version accordingly: [example](https://github.com/flutter-stripe/flutter_stripe/blob/main/example/android/gradle/wrapper/gradle-wrapper.properties#L6) +6. Using `FlutterFragmentActivity` instead of `FlutterActivity` in `MainActivity.kt`: [example](https://github.com/flutter-stripe/flutter_stripe/blob/79b201a2e9b827196d6a97bb41e1d0e526632a5a/example/android/app/src/main/kotlin/com/flutter/stripe/example/MainActivity.kt#L6) +7. 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 From e2e26df0ea4eaee8498fe133e8d9980d0d16281c Mon Sep 17 00:00:00 2001 From: Remon Date: Wed, 29 Nov 2023 20:32:48 +0000 Subject: [PATCH 2/4] chore(release): publish packages - flutter_stripe@9.6.0+1 --- CHANGELOG.md | 21 +++++++++++++++++++++ packages/stripe/CHANGELOG.md | 3 +++ packages/stripe/pubspec.yaml | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 764cbd3bb..6b3e0c375 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,27 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## 2023-11-29 + +### Changes + +--- + +Packages with breaking changes: + + - There are no breaking changes in this release. + +Packages with other changes: + + - [`flutter_stripe` - `v9.6.0+1`](#flutter_stripe---v9601) + +--- + +#### `flutter_stripe` - `v9.6.0+1` + + - add requirement for Android gradle plugin to readme + + ## 2023-11-28 ### Changes diff --git a/packages/stripe/CHANGELOG.md b/packages/stripe/CHANGELOG.md index cd46dfd9c..991554a89 100644 --- a/packages/stripe/CHANGELOG.md +++ b/packages/stripe/CHANGELOG.md @@ -1,3 +1,6 @@ +## 9.6.0+1 +- add requirement for Android gradle plugin to readme + ## 9.6.0 Sync with Stripe React Native v0.34 and v0.35: diff --git a/packages/stripe/pubspec.yaml b/packages/stripe/pubspec.yaml index cc8d5e70f..71cd866e6 100644 --- a/packages/stripe/pubspec.yaml +++ b/packages/stripe/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_stripe description: Flutter library for Stripe. Supports PaymentSheets, Apple & Google Pay, SCA, PSD2 and much more. -version: 9.6.0 +version: 9.6.0+1 homepage: https://github.com/flutter-stripe/flutter_stripe repository: https://github.com/flutter-stripe/flutter_stripe From 0d41d20a267dad0982df72b3a61a53ca9d17d6e5 Mon Sep 17 00:00:00 2001 From: Remon Date: Wed, 29 Nov 2023 20:37:01 +0000 Subject: [PATCH 3/4] chore(release): publish packages - stripe_android@9.6.0+1 --- CHANGELOG.md | 28 ++++++++++++++++++++ example/android/app/build.gradle | 2 +- packages/stripe/pubspec.yaml | 2 +- packages/stripe_android/CHANGELOG.md | 4 +++ packages/stripe_android/android/build.gradle | 2 +- packages/stripe_android/pubspec.yaml | 2 +- 6 files changed, 36 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b3e0c375..dfb54d08c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,34 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## 2023-11-29 + +### Changes + +--- + +Packages with breaking changes: + + - There are no breaking changes in this release. + +Packages with other changes: + + - [`stripe_android` - `v9.6.0+1`](#stripe_android---v9601) + - [`flutter_stripe` - `v9.6.1`](#flutter_stripe---v961) + +Packages with dependency updates only: + +> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project. + + - `flutter_stripe` - `v9.6.1` + +--- + +#### `stripe_android` - `v9.6.0+1` + + - fix: compile sdk to 33 + + ## 2023-11-29 ### Changes diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index cef76545c..7522525ea 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace 'com.flutter.stripe.example' - compileSdk 34 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_17 diff --git a/packages/stripe/pubspec.yaml b/packages/stripe/pubspec.yaml index 71cd866e6..52aacd15a 100644 --- a/packages/stripe/pubspec.yaml +++ b/packages/stripe/pubspec.yaml @@ -22,7 +22,7 @@ dependencies: flutter: sdk: flutter meta: ^1.8.0 - stripe_android: ^9.6.0 + stripe_android: ^9.6.0+1 stripe_ios: ^9.6.0 stripe_platform_interface: ^9.6.0 dev_dependencies: diff --git a/packages/stripe_android/CHANGELOG.md b/packages/stripe_android/CHANGELOG.md index cd46dfd9c..130cb64af 100644 --- a/packages/stripe_android/CHANGELOG.md +++ b/packages/stripe_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 9.6.0+1 + + - fix: compile sdk to 33 + ## 9.6.0 Sync with Stripe React Native v0.34 and v0.35: diff --git a/packages/stripe_android/android/build.gradle b/packages/stripe_android/android/build.gradle index c167d2f5f..590c89ed8 100644 --- a/packages/stripe_android/android/build.gradle +++ b/packages/stripe_android/android/build.gradle @@ -28,7 +28,7 @@ apply plugin: 'kotlin-android' android { namespace 'com.flutter.stripe' - compileSdk 34 + compileSdk 33 compileOptions { sourceCompatibility JavaVersion.VERSION_17 diff --git a/packages/stripe_android/pubspec.yaml b/packages/stripe_android/pubspec.yaml index d6370695a..7bfaa7000 100644 --- a/packages/stripe_android/pubspec.yaml +++ b/packages/stripe_android/pubspec.yaml @@ -1,6 +1,6 @@ name: stripe_android description: Stripe platform implementation for Android -version: 9.6.0 +version: 9.6.0+1 repository: https://github.com/flutter-stripe/flutter_stripe homepage: https://pub.dev/packages/flutter_stripe From 9fcad5a8b8bc57534580ac5b5e6e012fd0b54f3e Mon Sep 17 00:00:00 2001 From: Remon Date: Wed, 29 Nov 2023 20:39:03 +0000 Subject: [PATCH 4/4] repair incorrect compile sdk --- packages/stripe_android/android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/stripe_android/android/build.gradle b/packages/stripe_android/android/build.gradle index 590c89ed8..464d96676 100644 --- a/packages/stripe_android/android/build.gradle +++ b/packages/stripe_android/android/build.gradle @@ -31,8 +31,8 @@ android { compileSdk 33 compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } kotlinOptions {