Commit 412df9b8b628e6593cc554599b89d736b0ad7f6d

Authored by iOS-Xiaowen
2 parents 1aaf69f4 fb8205a4

Merge branch 'WKWebView' of bj.gitlab.cnlive.com:ios-team/ScioLive into WKWebView

CNLiveScioLive.xcodeproj/project.pbxproj
... ... @@ -3600,7 +3600,7 @@
3600 3600 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3601 3601 CODE_SIGN_IDENTITY = "Apple Development";
3602 3602 CODE_SIGN_STYLE = Automatic;
3603   - CURRENT_PROJECT_VERSION = 368;
  3603 + CURRENT_PROJECT_VERSION = 370;
3604 3604 DEVELOPMENT_TEAM = 94X49GG3ZW;
3605 3605 ENABLE_BITCODE = NO;
3606 3606 FRAMEWORK_SEARCH_PATHS = (
... ... @@ -3635,11 +3635,12 @@
3635 3635 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK",
3636 3636 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
3637 3637 );
3638   - MARKETING_VERSION = 3.5.8;
  3638 + MARKETING_VERSION = 3.5.9;
3639 3639 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3640 3640 PRODUCT_NAME = "$(TARGET_NAME)";
3641 3641 PROVISIONING_PROFILE_SPECIFIER = "";
3642 3642 TARGETED_DEVICE_FAMILY = 1;
  3643 + VALID_ARCHS = "arm64 arm64e armv7s";
3643 3644 };
3644 3645 name = Debug;
3645 3646 };
... ... @@ -3652,7 +3653,7 @@
3652 3653 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3653 3654 CODE_SIGN_IDENTITY = "Apple Development";
3654 3655 CODE_SIGN_STYLE = Automatic;
3655   - CURRENT_PROJECT_VERSION = 368;
  3656 + CURRENT_PROJECT_VERSION = 370;
3656 3657 DEVELOPMENT_TEAM = 94X49GG3ZW;
3657 3658 ENABLE_BITCODE = NO;
3658 3659 FRAMEWORK_SEARCH_PATHS = (
... ... @@ -3687,11 +3688,12 @@
3687 3688 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK",
3688 3689 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
3689 3690 );
3690   - MARKETING_VERSION = 3.5.8;
  3691 + MARKETING_VERSION = 3.5.9;
3691 3692 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3692 3693 PRODUCT_NAME = "$(TARGET_NAME)";
3693 3694 PROVISIONING_PROFILE_SPECIFIER = "";
3694 3695 TARGETED_DEVICE_FAMILY = 1;
  3696 + VALID_ARCHS = "arm64 arm64e armv7s";
3695 3697 };
3696 3698 name = Release;
3697 3699 };
... ...
auto_upload.py
... ... @@ -17,9 +17,8 @@ from collections import ChainMap
17 17  
18 18 project_name = 'CNLiveScioLive' # 项目名称
19 19 upload_version = '1.0.0' # 项目版本
20   -archive_workspace_path = '/Users/cnlive-zxw/Desktop/ScioLive' # 项目路径
21   -#'/Users/cnlive/Desktop/仓库/ScioLive'
22   -#'/Users/cnlive-zxw/Desktop/ScioLive'
  20 +#archive_workspace_path = '/Users/cnlive-zxw/Desktop/ScioLive' #项目路径 张晓文
  21 +archive_workspace_path = '/Users/cnlive/Desktop/仓库/ScioLive' #项目路径 张旭
23 22 export_directory = 'Products' # 输出的文件夹
24 23 ipa_pgyer_download_url = 'https://www.pgyer.com/QgmN' #蒲公英的APP地址
25 24 ipa_fir_download_url = 'http://d.6short.com/zvk2' #fir的APP地址
... ...