iOS Team / ScioLive · Commits

Commit 2e94052a486c8008cc0d06f1fcbac9e6c3d85185

Authored by iOS-Xiaowen
2 parents 545346b4 1d9ff326

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

# Conflicts:
#	CNLiveScioLive.xcodeproj/project.pbxproj
Inline Side-by-side
Showing 1 changed file with 8 additions and 8 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
  View file @2e94052
... ... @@ -3608,9 +3608,9 @@
3608 3608 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
3609 3609 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
3610 3610 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3611   - CODE_SIGN_IDENTITY = "iPhone Distribution";
3612   - CODE_SIGN_STYLE = Manual;
3613   - CURRENT_PROJECT_VERSION = 366;
  3611 + CODE_SIGN_IDENTITY = "Apple Development";
  3612 + CODE_SIGN_STYLE = Automatic;
  3613 + CURRENT_PROJECT_VERSION = 367;
3614 3614 DEVELOPMENT_TEAM = 94X49GG3ZW;
3615 3615 ENABLE_BITCODE = NO;
3616 3616 FRAMEWORK_SEARCH_PATHS = (
... ... @@ -3648,7 +3648,7 @@
3648 3648 MARKETING_VERSION = 3.5.6;
3649 3649 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3650 3650 PRODUCT_NAME = "$(TARGET_NAME)";
3651   - PROVISIONING_PROFILE_SPECIFIER = SCIOLive_distribution;
  3651 + PROVISIONING_PROFILE_SPECIFIER = "";
3652 3652 TARGETED_DEVICE_FAMILY = 1;
3653 3653 };
3654 3654 name = Debug;
... ... @@ -3660,9 +3660,9 @@
3660 3660 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
3661 3661 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
3662 3662 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3663   - CODE_SIGN_IDENTITY = "iPhone Distribution";
3664   - CODE_SIGN_STYLE = Manual;
3665   - CURRENT_PROJECT_VERSION = 366;
  3663 + CODE_SIGN_IDENTITY = "Apple Development";
  3664 + CODE_SIGN_STYLE = Automatic;
  3665 + CURRENT_PROJECT_VERSION = 367;
3666 3666 DEVELOPMENT_TEAM = 94X49GG3ZW;
3667 3667 ENABLE_BITCODE = NO;
3668 3668 FRAMEWORK_SEARCH_PATHS = (
... ... @@ -3700,7 +3700,7 @@
3700 3700 MARKETING_VERSION = 3.5.6;
3701 3701 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3702 3702 PRODUCT_NAME = "$(TARGET_NAME)";
3703   - PROVISIONING_PROFILE_SPECIFIER = SCIOLive_distribution;
  3703 + PROVISIONING_PROFILE_SPECIFIER = "";
3704 3704 TARGETED_DEVICE_FAMILY = 1;
3705 3705 };
3706 3706 name = Release;
... ...