Skip to content

Commit 737d9e1

Browse files
mit-73zedaraf
andauthored
Bump (#36)
* Bumped flutter_svg version. * Fix lifecycle and bump (#35) * fix: Edit AppLifecycle in PayButton * chore: bump * build: Fix ios build Co-authored-by: Ziyad Farhan <56755783+ZiyadF296@users.noreply.github.com>
1 parent 576f843 commit 737d9e1

File tree

8 files changed

+40
-17
lines changed

8 files changed

+40
-17
lines changed

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>8.0</string>
24+
<string>9.0</string>
2525
</dict>
2626
</plist>

example/ios/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ EXTERNAL SOURCES:
2020
:path: ".symlinks/plugins/mad_pay_ios/ios"
2121

2222
SPEC CHECKSUMS:
23-
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
23+
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
2424
mad_pay_ios: 28a0b15f77044eecae3422848e258053d917a86f
2525
SwiftProtobuf: 4e16842b83c6fda06b10fac50d73b3f1fce8ab7b
2626

example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 51;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -113,7 +113,6 @@
113113
D9292F9B2B0971B48FD2AD32 /* Pods-Runner.release.xcconfig */,
114114
5535ED66ADC32F7CA1646959 /* Pods-Runner.profile.xcconfig */,
115115
);
116-
name = Pods;
117116
path = Pods;
118117
sourceTree = "<group>";
119118
};
@@ -357,12 +356,16 @@
357356
CLANG_ENABLE_MODULES = YES;
358357
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
359358
ENABLE_BITCODE = NO;
359+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386";
360360
FRAMEWORK_SEARCH_PATHS = (
361361
"$(inherited)",
362362
"$(PROJECT_DIR)/Flutter",
363363
);
364364
INFOPLIST_FILE = Runner/Info.plist;
365-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
365+
LD_RUNPATH_SEARCH_PATHS = (
366+
"$(inherited)",
367+
"@executable_path/Frameworks",
368+
);
366369
LIBRARY_SEARCH_PATHS = (
367370
"$(inherited)",
368371
"$(PROJECT_DIR)/Flutter",
@@ -475,7 +478,8 @@
475478
MTL_ENABLE_DEBUG_INFO = NO;
476479
SDKROOT = iphoneos;
477480
SUPPORTED_PLATFORMS = iphoneos;
478-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
481+
SWIFT_COMPILATION_MODE = wholemodule;
482+
SWIFT_OPTIMIZATION_LEVEL = "-O";
479483
TARGETED_DEVICE_FAMILY = "1,2";
480484
VALIDATE_PRODUCT = YES;
481485
};
@@ -489,12 +493,16 @@
489493
CLANG_ENABLE_MODULES = YES;
490494
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
491495
ENABLE_BITCODE = NO;
496+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386";
492497
FRAMEWORK_SEARCH_PATHS = (
493498
"$(inherited)",
494499
"$(PROJECT_DIR)/Flutter",
495500
);
496501
INFOPLIST_FILE = Runner/Info.plist;
497-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
502+
LD_RUNPATH_SEARCH_PATHS = (
503+
"$(inherited)",
504+
"@executable_path/Frameworks",
505+
);
498506
LIBRARY_SEARCH_PATHS = (
499507
"$(inherited)",
500508
"$(PROJECT_DIR)/Flutter",
@@ -516,12 +524,16 @@
516524
CLANG_ENABLE_MODULES = YES;
517525
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
518526
ENABLE_BITCODE = NO;
527+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386";
519528
FRAMEWORK_SEARCH_PATHS = (
520529
"$(inherited)",
521530
"$(PROJECT_DIR)/Flutter",
522531
);
523532
INFOPLIST_FILE = Runner/Info.plist;
524-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
533+
LD_RUNPATH_SEARCH_PATHS = (
534+
"$(inherited)",
535+
"@executable_path/Frameworks",
536+
);
525537
LIBRARY_SEARCH_PATHS = (
526538
"$(inherited)",
527539
"$(PROJECT_DIR)/Flutter",

packages/mad_pay/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 2.2.6
2+
3+
* Bump `mad_pay_android` version to `2.2.5`
4+
* Edit `AppLifecycle` in `PayButton`
5+
16
## 2.2.5
27

38
* Fix typo `emailAddress`

packages/mad_pay/lib/src/widgets/pay_button.dart

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class _PayButtonState extends State<_PayButton> with WidgetsBindingObserver {
6969
final StreamController<bool> availablePaymentsStatus =
7070
StreamController<bool>();
7171

72-
AppLifecycleState? _lastState;
72+
bool hasUpdate = false;
7373

7474
@override
7575
void initState() {
@@ -86,12 +86,14 @@ class _PayButtonState extends State<_PayButton> with WidgetsBindingObserver {
8686

8787
@override
8888
void didChangeAppLifecycleState(AppLifecycleState state) {
89-
if (_lastState == AppLifecycleState.paused &&
90-
state == AppLifecycleState.resumed) {
89+
if (state == AppLifecycleState.paused) {
90+
hasUpdate = true;
91+
}
92+
93+
if (state == AppLifecycleState.resumed && hasUpdate) {
9194
availablePaymentsStatus
9295
.addStream(Stream<bool>.fromFuture(checkPayments()));
9396
}
94-
_lastState = state;
9597
}
9698

9799
Future<bool> checkPayments() async {

packages/mad_pay/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: mad_pay
22
description: Mad Pay will help you make payments through Apple Pay and Google Pay
3-
version: 2.2.5
3+
version: 2.2.6
44
repository: https://github.com/MadBrains/Mad-Pay-Flutter
55
issue_tracker: https://github.com/MadBrains/Mad-Pay-Flutter/issues
66
homepage: https://madbrains.ru/
@@ -13,7 +13,7 @@ dependencies:
1313
flutter:
1414
sdk: flutter
1515
mad_pay_platform_interface: ^2.2.2
16-
mad_pay_android: ^2.2.4
16+
mad_pay_android: ^2.2.5
1717
mad_pay_ios: ^2.2.3
1818

1919
# For development. Remove/comment before publishing to pub.

packages/mad_pay_android/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.2.5
2+
3+
* Bump `flutter_svg` version to `0.23.0+1`
4+
15
## 2.2.4
26

37
* Fix typo `emailAddress`

packages/mad_pay_android/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: mad_pay_android
22
description: A plug-in to add support for payments on the Android side of Mad Pay
3-
version: 2.2.4
3+
version: 2.2.5
44
repository: https://github.com/MadBrains/Mad-Pay-Flutter
55
issue_tracker: https://github.com/MadBrains/Mad-Pay-Flutter/issues
66
homepage: https://madbrains.ru/
@@ -15,7 +15,7 @@ dependencies:
1515
flutter_localizations:
1616
sdk: flutter
1717
mad_pay_platform_interface: ^2.2.2
18-
flutter_svg: ^0.22.0
18+
flutter_svg: ^0.23.0+1
1919

2020
# For development. Remove/comment before publishing to pub.
2121
# dependency_overrides:
@@ -66,4 +66,4 @@ flutter:
6666
platforms:
6767
android:
6868
package: ru.madbrains.mad_pay_android
69-
pluginClass: MadPayAndroidPlugin
69+
pluginClass: MadPayAndroidPlugin

0 commit comments

Comments
 (0)