xt / Flutter-ReserveApp · Commits

Go to a project

Commit fb52e529e0497e560e1984745a10dc1ccdbcdf3a

Authored by wdn127929
2 parents ed81e504 1f763a10

Merge branch 'v5.2.0.4+' into v5.2.1+

Inline Side-by-side
Showing 3 changed files with 11 additions and 8 deletions
@@ -45,6 +45,9 @@ post_install do |installer| @@ -45,6 +45,9 @@ post_install do |installer|
45 installer.pods_project.targets.each do |target| 45 installer.pods_project.targets.each do |target|
46 flutter_additional_ios_build_settings(target) 46 flutter_additional_ios_build_settings(target)
47 target.build_configurations.each do |config| 47 target.build_configurations.each do |config|
  48 + if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 11.0
  49 + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
  50 +
48 config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [ 51 config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
49 '$(inherited)', 52 '$(inherited)',
50 # dart: PermissionGroup.calendar 53 # dart: PermissionGroup.calendar
@@ -63,7 +66,7 @@ post_install do |installer| @@ -63,7 +66,7 @@ post_install do |installer|
63 # dart: PermissionGroup.mediaLibrary 66 # dart: PermissionGroup.mediaLibrary
64 'PERMISSION_MEDIA_LIBRARY=1', 67 'PERMISSION_MEDIA_LIBRARY=1',
65 ] 68 ]
66 - 69 + end
67 end 70 end
68 end 71 end
69 end 72 end
@@ -399,6 +399,6 @@ SPEC CHECKSUMS: @@ -399,6 +399,6 @@ SPEC CHECKSUMS:
399 webview_flutter: 3603125dfd3bcbc9d8d418c3f80aeecf331c068b 399 webview_flutter: 3603125dfd3bcbc9d8d418c3f80aeecf331c068b
400 WechatOpenSDK-XCFramework: acdeeda129efbef9532bca8a10c24e1b4b8c7d69 400 WechatOpenSDK-XCFramework: acdeeda129efbef9532bca8a10c24e1b4b8c7d69
401 401
402 -PODFILE CHECKSUM: 25b613241884608415e00786e0e7d3ddb66b1878 402 +PODFILE CHECKSUM: 48966b0a18269c2f7056b0443d2421005093a4dc
403 403
404 COCOAPODS: 1.11.3 404 COCOAPODS: 1.11.3
@@ -548,7 +548,7 @@ @@ -548,7 +548,7 @@
548 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 548 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
549 CODE_SIGN_IDENTITY = "Apple Development"; 549 CODE_SIGN_IDENTITY = "Apple Development";
550 CODE_SIGN_STYLE = Automatic; 550 CODE_SIGN_STYLE = Automatic;
551 - CURRENT_PROJECT_VERSION = 521; 551 + CURRENT_PROJECT_VERSION = 522;
552 DEVELOPMENT_TEAM = 8J59HM8B82; 552 DEVELOPMENT_TEAM = 8J59HM8B82;
553 ENABLE_BITCODE = NO; 553 ENABLE_BITCODE = NO;
554 FLUTTER_BUILD_MODE = release; 554 FLUTTER_BUILD_MODE = release;
@@ -566,7 +566,7 @@ @@ -566,7 +566,7 @@
566 "$(inherited)", 566 "$(inherited)",
567 "$(PROJECT_DIR)/Flutter", 567 "$(PROJECT_DIR)/Flutter",
568 ); 568 );
569 - MARKETING_VERSION = 5.2.1; 569 + MARKETING_VERSION = 5.2.2;
570 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 570 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
571 PRODUCT_NAME = Runner; 571 PRODUCT_NAME = Runner;
572 PROVISIONING_PROFILE_SPECIFIER = ""; 572 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -699,7 +699,7 @@ @@ -699,7 +699,7 @@
699 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 699 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
700 CODE_SIGN_IDENTITY = "Apple Development"; 700 CODE_SIGN_IDENTITY = "Apple Development";
701 CODE_SIGN_STYLE = Automatic; 701 CODE_SIGN_STYLE = Automatic;
702 - CURRENT_PROJECT_VERSION = 521; 702 + CURRENT_PROJECT_VERSION = 522;
703 DEVELOPMENT_TEAM = 8J59HM8B82; 703 DEVELOPMENT_TEAM = 8J59HM8B82;
704 ENABLE_BITCODE = NO; 704 ENABLE_BITCODE = NO;
705 FLUTTER_BUILD_MODE = debug; 705 FLUTTER_BUILD_MODE = debug;
@@ -717,7 +717,7 @@ @@ -717,7 +717,7 @@
717 "$(inherited)", 717 "$(inherited)",
718 "$(PROJECT_DIR)/Flutter", 718 "$(PROJECT_DIR)/Flutter",
719 ); 719 );
720 - MARKETING_VERSION = 5.2.1; 720 + MARKETING_VERSION = 5.2.2;
721 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 721 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
722 PRODUCT_NAME = Runner; 722 PRODUCT_NAME = Runner;
723 PROVISIONING_PROFILE_SPECIFIER = ""; 723 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -738,7 +738,7 @@ @@ -738,7 +738,7 @@
738 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 738 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
739 CODE_SIGN_IDENTITY = "Apple Development"; 739 CODE_SIGN_IDENTITY = "Apple Development";
740 CODE_SIGN_STYLE = Automatic; 740 CODE_SIGN_STYLE = Automatic;
741 - CURRENT_PROJECT_VERSION = 521; 741 + CURRENT_PROJECT_VERSION = 522;
742 DEVELOPMENT_TEAM = 8J59HM8B82; 742 DEVELOPMENT_TEAM = 8J59HM8B82;
743 ENABLE_BITCODE = NO; 743 ENABLE_BITCODE = NO;
744 FLUTTER_BUILD_MODE = release; 744 FLUTTER_BUILD_MODE = release;
@@ -756,7 +756,7 @@ @@ -756,7 +756,7 @@
756 "$(inherited)", 756 "$(inherited)",
757 "$(PROJECT_DIR)/Flutter", 757 "$(PROJECT_DIR)/Flutter",
758 ); 758 );
759 - MARKETING_VERSION = 5.2.1; 759 + MARKETING_VERSION = 5.2.2;
760 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 760 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
761 PRODUCT_NAME = Runner; 761 PRODUCT_NAME = Runner;
762 PROVISIONING_PROFILE_SPECIFIER = ""; 762 PROVISIONING_PROFILE_SPECIFIER = "";