Skip to content

Commit 89f45e1

Browse files
remonh87jonasbark
andauthored
Sync (#2188)
* sync step #1 * sync #2: Android generally works * more iOS work * move objc files into respective objc swift package section * add header file * iOS: add StripeSdkEmitter implementation * fix compilation for SPM * feat: add additional payment sheet config * chore add reactbuildconfig java to fix android compilation * fix: improve result objects for native views * fix color parsing * Sync with React Native v0.50.1 * feat: add custompayment support * chore: remove sofort as it is not supported by Stripe anymore * chore fix api stripe js * missing import * update CI * use macos 15 * attempt to fix integration tests * attempt to fix integration tests * fix dangerouslyUpdateCardDetails on iOS when no CardField or CardForm is available on screen * Upgrade freezed 3 (#2199) * refactor: move to freezed 3 version * refactor: migrate js to freezed3 * chore: upfrade dependencies for web ios and android * chore update stripe depedencies and example app --------- Co-authored-by: Jonas Bark <[email protected]>
1 parent 1d74ad9 commit 89f45e1

File tree

391 files changed

+85640
-89013
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

391 files changed

+85640
-89013
lines changed

.github/workflows/all_plugins.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
name: integration test (iOS)
7777
needs: [analyze, test]
7878
timeout-minutes: 60
79-
runs-on: macos-14
79+
runs-on: macos-15
8080
steps:
8181
- uses: actions/checkout@v2
8282
- uses: subosito/flutter-action@v2
@@ -85,6 +85,11 @@ jobs:
8585
node-version: 16
8686
cache: 'yarn'
8787
cache-dependency-path: example/server/yarn.lock
88+
89+
- uses: maxim-lobanov/setup-xcode@v1
90+
with:
91+
xcode-version: latest-stable
92+
8893
- name: "Install Tools"
8994
run: |
9095
./.github/workflows/scripts/install-tools.sh
@@ -111,7 +116,7 @@ jobs:
111116
112117
- name: "Start iOS Simulator"
113118
run: |
114-
xcrun simctl boot "iPhone 15"
119+
xcrun simctl boot "iPhone 16"
115120
116121
- name: "Run Flutter Driver tests on iOS"
117122
working-directory: example
@@ -121,7 +126,7 @@ jobs:
121126
name: integration test (Android)
122127
needs: [analyze, test]
123128
timeout-minutes: 60
124-
runs-on: macos-13
129+
runs-on: macos-15
125130
steps:
126131
- uses: actions/checkout@v2
127132
- uses: subosito/flutter-action@v2
@@ -167,6 +172,7 @@ jobs:
167172
with:
168173
api-level: 34
169174
arch: x86_64
175+
emulator-boot-timeout: 1400
170176
working-directory: example
171177
script: |
172178
sleep 15;

example/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ flutter {
6767

6868
dependencies {
6969
implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.7.0'
70-
implementation 'com.google.android.gms:play-services-wallet:19.1.0'
70+
implementation 'com.google.android.gms:play-services-wallet:19.3.0'
7171
androidTestImplementation 'androidx.test:runner:1.2.0'
7272
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
7373
}

example/ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>12.0</string>
24+
<string>13.0</string>
2525
</dict>
2626
</plist>

example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 66 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
buildConfiguration = "Debug"
4545
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4646
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
4748
shouldUseLaunchSchemeArgsEnv = "YES">
4849
<MacroExpansion>
4950
<BuildableReference
@@ -71,6 +72,7 @@
7172
buildConfiguration = "Debug"
7273
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7374
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
75+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
7476
launchStyle = "0"
7577
useCustomWorkingDirectory = "NO"
7678
ignoresPersistentStateOnLaunch = "NO"

example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 66 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/ios/Runner/Info.plist

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<dict>
55
<key>CADisableMinimumFrameDurationOnPhone</key>
66
<true/>
7+
<key>CFBundleAllowMixedLocalizations</key>
8+
<string>true</string>
79
<key>CFBundleDevelopmentRegion</key>
810
<string>$(DEVELOPMENT_LANGUAGE)</string>
911
<key>CFBundleExecutable</key>
@@ -39,13 +41,13 @@
3941
<true/>
4042
<key>LSRequiresIPhoneOS</key>
4143
<true/>
42-
<key>CFBundleAllowMixedLocalizations</key>
43-
<string>true</string>
4444
<key>NSCameraUsageDescription</key>
4545
<string>Scan your card to add it automatically</string>
4646
<key>NSCameraUsageDescription
4747
&lt;string&gt;To scan cards&lt;/string&gt;</key>
4848
<string>To scan cards</string>
49+
<key>UIApplicationSupportsIndirectInputEvents</key>
50+
<true/>
4951
<key>UILaunchStoryboardName</key>
5052
<string>LaunchScreen</string>
5153
<key>UIMainStoryboardFile</key>
@@ -65,7 +67,5 @@
6567
</array>
6668
<key>UIViewControllerBasedStatusBarAppearance</key>
6769
<false/>
68-
<key>UIApplicationSupportsIndirectInputEvents</key>
69-
<true/>
7070
</dict>
7171
</plist>

example/lib/screens/regional_payment_methods/sofort_screen.dart

Lines changed: 0 additions & 92 deletions
This file was deleted.

example/lib/screens/screens.dart

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import 'package:stripe_example/screens/regional_payment_methods/klarna_screen.da
1717
import 'package:stripe_example/screens/regional_payment_methods/p24_screen.dart';
1818
import 'package:stripe_example/screens/regional_payment_methods/paypal_screen.dart';
1919
import 'package:stripe_example/screens/regional_payment_methods/revolutpay_screen.dart';
20-
import 'package:stripe_example/screens/regional_payment_methods/sofort_screen.dart';
2120
import 'package:stripe_example/screens/regional_payment_methods/us_bank_account_direct_debit_screen.dart';
2221
import 'package:stripe_example/screens/regional_payment_methods/us_bank_account_screen.dart';
2322
import 'package:stripe_example/screens/setup_future_payments/setup_future_payments_screen.dart';
@@ -291,12 +290,6 @@ class Example extends StatelessWidget {
291290
),
292291
builder: (context) => IdealScreen(),
293292
),
294-
Example(
295-
title: 'Sofort',
296-
leading: SizedBox(),
297-
builder: (context) => SofortScreen(),
298-
platformsSupported: [DevicePlatform.android, DevicePlatform.ios],
299-
),
300293
Example(
301294
title: 'Aubecs',
302295
builder: (context) => AubecsExample(),

0 commit comments

Comments
 (0)