Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
marcolettieri authored Jun 24, 2024
2 parents 6d1f41f + 1054c04 commit 956a578
Show file tree
Hide file tree
Showing 149 changed files with 5,875 additions and 3,325 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.freezed.dart linguist-generated=true
*.g.dart linguist-generated=true
18 changes: 4 additions & 14 deletions .github/workflows/all_plugins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,24 +76,15 @@ jobs:
name: integration test (iOS)
needs: [analyze, test]
timeout-minutes: 60
runs-on: macos-latest
runs-on: macos-14
steps:
- uses: actions/checkout@v2
- uses: subosito/flutter-action@v2
with:
cache: true
- uses: actions/setup-node@v3
with:
node-version: 16
cache: 'yarn'
cache-dependency-path: example/server/yarn.lock
- name: Cache pods
uses: actions/cache@v2
with:
path: example/iOS/Pods
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
restore-keys: |
${{ runner.os }}-pods-
- name: "Install Tools"
run: |
./.github/workflows/scripts/install-tools.sh
Expand All @@ -120,7 +111,7 @@ jobs:
- name: "Start iOS Simulator"
run: |
xcrun simctl boot "iPhone 13 mini"
xcrun simctl boot "iPhone 15"
- name: "Run Flutter Driver tests on iOS"
working-directory: example
Expand All @@ -130,12 +121,10 @@ jobs:
name: integration test (Android)
needs: [analyze, test, ios_integration_test]
timeout-minutes: 60
runs-on: macos-latest
runs-on: macos-14
steps:
- uses: actions/checkout@v2
- uses: subosito/flutter-action@v2
with:
cache: true
- uses: actions/setup-node@v3
with:
node-version: 16
Expand Down Expand Up @@ -177,6 +166,7 @@ jobs:
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 34
arch: x86_64
working-directory: example
script: |
sleep 15;
Expand Down
221 changes: 221 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,227 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## 2024-03-26

### Changes

---

Packages with breaking changes:

- There are no breaking changes in this release.

Packages with other changes:

- [`stripe_platform_interface` - `v10.1.1`](#stripe_platform_interface---v1011)
- [`flutter_stripe_web` - `v5.1.1`](#flutter_stripe_web---v511)
- [`flutter_stripe` - `v10.1.2`](#flutter_stripe---v1012)

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_web` - `v5.1.1`
- `flutter_stripe` - `v10.1.2`

---

#### `stripe_platform_interface` - `v10.1.1`

- Fix #1639 cashapp payments


## 2024-03-07

### Changes

---

Packages with breaking changes:

- There are no breaking changes in this release.

Packages with other changes:

- [`stripe_android` - `v10.1.1`](#stripe_android---v1011)
- [`flutter_stripe` - `v10.1.1`](#flutter_stripe---v1011)

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` - `v10.1.1`

---

#### `stripe_android` - `v10.1.1`

- Fix build error on SDK 34


## 2024-03-02

### Changes

---

Packages with breaking changes:

- [`flutter_stripe` - `v10.1.0`](#flutter_stripe---v1010)

Packages with other changes:

- There are no other changes in this release.

---

#### `flutter_stripe` - `v10.1.0`

- aa

- **BREAKING** **BREAKING**: rename ApplePayShippingContact to Platformpayshipping contact.


## 2024-03-02

### Changes

---

Packages with breaking changes:

- [`flutter_stripe_web` - `v5.1.0`](#flutter_stripe_web---v510)

Packages with other changes:

- There are no other changes in this release.

---

#### `flutter_stripe_web` - `v5.1.0`

- aaa

- **FIX**: Respect the font color for CardField on web platforms (#1658).
- **FIX**: #1512 add latest charge field to payment intent (Web only).
- **BREAKING** **BREAKING**: rename ApplePayShippingContact to Platformpayshipping contact.


## 2024-03-02

### Changes

---

Packages with breaking changes:

- There are no breaking changes in this release.

Packages with other changes:

- [`stripe_js` - `v3.4.0`](#stripe_js---v340)
- [`flutter_stripe_web` - `v5.0.1`](#flutter_stripe_web---v501)

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_web` - `v5.0.1`

---

#### `stripe_js` - `v3.4.0`

- a


## 2024-03-02

### Changes

---

Packages with breaking changes:

- There are no breaking changes in this release.

Packages with other changes:

- [`stripe_ios` - `v10.1.0`](#stripe_ios---v1010)
- [`flutter_stripe` - `v10.0.1`](#flutter_stripe---v1001)

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` - `v10.0.1`

---

#### `stripe_ios` - `v10.1.0`


## 2024-03-02

### Changes

---

Packages with breaking changes:

- There are no breaking changes in this release.

Packages with other changes:

- [`stripe_android` - `v10.1.0`](#stripe_android---v1010)
- [`flutter_stripe` - `v10.0.1`](#flutter_stripe---v1001)

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` - `v10.0.1`

---

#### `stripe_android` - `v10.1.0`

- aa


## 2024-03-02

### Changes

---

Packages with breaking changes:

- [`stripe_platform_interface` - `v10.1.0`](#stripe_platform_interface---v1010)

Packages with other changes:

- [`flutter_stripe` - `v10.0.1`](#flutter_stripe---v1001)
- [`flutter_stripe_web` - `v5.0.1`](#flutter_stripe_web---v501)

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` - `v10.0.1`
- `flutter_stripe_web` - `v5.0.1`

---

#### `stripe_platform_interface` - `v10.1.0`

- aaa

- **FIX**: #1465 unknow result.
- **FIX**: #1512 add latest charge field to payment intent (Web only).
- **BREAKING** **BREAKING**: rename ApplePayShippingContact to Platformpayshipping contact.


## 2023-12-19

### Changes
Expand Down
2 changes: 1 addition & 1 deletion example/ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>11.0</string>
<string>12.0</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion example/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1430;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
59D21C0B270B725C007DE134 = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 2 additions & 0 deletions example/ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
<true/>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>CFBundleAllowMixedLocalizations</key>
<string>true</string>
<key>NSCameraUsageDescription</key>
<string>Scan your card to add it automatically</string>
<key>NSCameraUsageDescription
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,15 @@ class _PaymentSheetScreenState extends State<ApplePayPaymentSheetScreen> {
request: PaymentRequestType.recurring(
description: 'subscription',
managementUrl: 'https://flutter.dev',
billing: ImmediateCartSummaryItem(
billing: RecurringCartSummaryItem(
label: 'Subscription',
amount: '10.0',
isPending: false,
intervalCount: 12,
intervalUnit: ApplePayIntervalUnit.month,
startDate: DateTime.now().millisecondsSinceEpoch,
endDate: DateTime.now()
.add(Duration(days: 365))
.millisecondsSinceEpoch,
),
),
),
Expand Down
4 changes: 2 additions & 2 deletions example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ environment:
dependencies:
flutter:
sdk: flutter
flutter_stripe: ^9.4.0
flutter_stripe_web: ^4.4.0
flutter_stripe: ^10.2.0
flutter_stripe_web: ^5.1.0
stripe_checkout: ^1.0.1
pay: ^1.1.0
http: ^1.1.0
Expand Down
4 changes: 3 additions & 1 deletion example/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"@babel/cli": "^7.12.1",
"@babel/core": "^7.9.6",
"@babel/runtime": "^7.9.6",
"@types/body-parser": "^1.19.5",
"@types/dotenv": "^8.2.0",
"@types/express": "^4.17.2",
"@types/jest": "^26.0.14",
Expand All @@ -38,7 +39,7 @@
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.10.0",
"eslint-plugin-prettier": "^3.1.2",
"express": "^4.17.3",
"express": "^4.19.2",
"husky": "^4.2.3",
"nodemon": "^1.19.1",
"onchange": "^6.1.0",
Expand All @@ -52,6 +53,7 @@
},
"dependencies": {
"@types/cors": "^2.8.12",
"body-parser": "^1.20.2",
"eslint-plugin-jest": "^24.1.0",
"jest": "^26.5.3",
"ts-jest": "^26.4.1"
Expand Down
3 changes: 3 additions & 0 deletions example/server/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ env.config({ path: './.env' });

import bodyParser from 'body-parser';
import express from 'express';
import cors from 'cors';

import Stripe from 'stripe';
import { generateResponse } from './utils';
Expand All @@ -16,6 +17,8 @@ const stripeWebhookSecret = process.env.STRIPE_WEBHOOK_SECRET || '';

const app = express();

app.use(cors());

app.use(
(
req: express.Request,
Expand Down
Loading

0 comments on commit 956a578

Please sign in to comment.