xt / Flutter-ReserveApp · Commits

Go to a project

Commit e12e114d5e909357e1dfa9dafb6489de3edd17d8

Authored by “gaiyaguang”
2 parents d38be8ef 2406ff27

合并

Inline Side-by-side
Showing 3 changed files with 12 additions and 8 deletions
1 -83b3ddec6f4d9a6ed2f11de1a0a1915e  
  1 +<<<<<<< HEAD
  2 +83b3ddec6f4d9a6ed2f11de1a0a1915e
  3 +=======
  4 +c71e777004aab201609920eac28801f9
  5 +>>>>>>> 2406ff27ef5df44d08bdbc317457d4068c568441
@@ -152,4 +152,4 @@ SPEC CHECKSUMS: @@ -152,4 +152,4 @@ SPEC CHECKSUMS:
152 152
153 PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa 153 PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa
154 154
155 -COCOAPODS: 1.9.3 155 +COCOAPODS: 1.9.1
@@ -409,7 +409,7 @@ @@ -409,7 +409,7 @@
409 CODE_SIGN_IDENTITY = "iPhone Developer"; 409 CODE_SIGN_IDENTITY = "iPhone Developer";
410 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 410 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
411 CODE_SIGN_STYLE = Automatic; 411 CODE_SIGN_STYLE = Automatic;
412 - CURRENT_PROJECT_VERSION = 150; 412 + CURRENT_PROJECT_VERSION = 152;
413 DEVELOPMENT_TEAM = 8J59HM8B82; 413 DEVELOPMENT_TEAM = 8J59HM8B82;
414 ENABLE_BITCODE = NO; 414 ENABLE_BITCODE = NO;
415 FRAMEWORK_SEARCH_PATHS = ( 415 FRAMEWORK_SEARCH_PATHS = (
@@ -422,7 +422,7 @@ @@ -422,7 +422,7 @@
422 "$(inherited)", 422 "$(inherited)",
423 "$(PROJECT_DIR)/Flutter", 423 "$(PROJECT_DIR)/Flutter",
424 ); 424 );
425 - MARKETING_VERSION = 1.5.0; 425 + MARKETING_VERSION = 1.5.2;
426 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 426 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
427 PRODUCT_NAME = "一键订"; 427 PRODUCT_NAME = "一键订";
428 PROVISIONING_PROFILE_SPECIFIER = ""; 428 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -551,7 +551,7 @@ @@ -551,7 +551,7 @@
551 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 551 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
552 CODE_SIGN_IDENTITY = "iPhone Developer"; 552 CODE_SIGN_IDENTITY = "iPhone Developer";
553 CODE_SIGN_STYLE = Automatic; 553 CODE_SIGN_STYLE = Automatic;
554 - CURRENT_PROJECT_VERSION = 150; 554 + CURRENT_PROJECT_VERSION = 152;
555 DEVELOPMENT_TEAM = 8J59HM8B82; 555 DEVELOPMENT_TEAM = 8J59HM8B82;
556 ENABLE_BITCODE = NO; 556 ENABLE_BITCODE = NO;
557 FRAMEWORK_SEARCH_PATHS = ( 557 FRAMEWORK_SEARCH_PATHS = (
@@ -564,7 +564,7 @@ @@ -564,7 +564,7 @@
564 "$(inherited)", 564 "$(inherited)",
565 "$(PROJECT_DIR)/Flutter", 565 "$(PROJECT_DIR)/Flutter",
566 ); 566 );
567 - MARKETING_VERSION = 1.5.0; 567 + MARKETING_VERSION = 1.5.2;
568 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 568 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
569 PRODUCT_NAME = "一键订"; 569 PRODUCT_NAME = "一键订";
570 PROVISIONING_PROFILE_SPECIFIER = ""; 570 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -584,7 +584,7 @@ @@ -584,7 +584,7 @@
584 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 584 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
585 CODE_SIGN_IDENTITY = "iPhone Developer"; 585 CODE_SIGN_IDENTITY = "iPhone Developer";
586 CODE_SIGN_STYLE = Automatic; 586 CODE_SIGN_STYLE = Automatic;
587 - CURRENT_PROJECT_VERSION = 150; 587 + CURRENT_PROJECT_VERSION = 152;
588 DEVELOPMENT_TEAM = 8J59HM8B82; 588 DEVELOPMENT_TEAM = 8J59HM8B82;
589 ENABLE_BITCODE = NO; 589 ENABLE_BITCODE = NO;
590 FRAMEWORK_SEARCH_PATHS = ( 590 FRAMEWORK_SEARCH_PATHS = (
@@ -597,7 +597,7 @@ @@ -597,7 +597,7 @@
597 "$(inherited)", 597 "$(inherited)",
598 "$(PROJECT_DIR)/Flutter", 598 "$(PROJECT_DIR)/Flutter",
599 ); 599 );
600 - MARKETING_VERSION = 1.5.0; 600 + MARKETING_VERSION = 1.5.2;
601 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 601 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
602 PRODUCT_NAME = "一键订"; 602 PRODUCT_NAME = "一键订";
603 PROVISIONING_PROFILE_SPECIFIER = ""; 603 PROVISIONING_PROFILE_SPECIFIER = "";