From d4ef51fefa8f6141b1228ade67d91af1756630b0 Mon Sep 17 00:00:00 2001 From: Danmei Chen Date: Tue, 3 Mar 2020 16:44:34 +0100 Subject: [PATCH] tag beta 4.3.0(1) --- Classes/AboutView.m | 2 +- linphone-Info.plist | 4 ++-- linphone.xcodeproj/project.pbxproj | 16 ++++++++++++++++ linphoneExtension/Info.plist | 4 ++-- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/Classes/AboutView.m b/Classes/AboutView.m index 721443917..dafb51822 100644 --- a/Classes/AboutView.m +++ b/Classes/AboutView.m @@ -50,7 +50,7 @@ static UICompositeViewDescription *compositeDescription = nil; NSString *name = [NSBundle.mainBundle objectForInfoDictionaryKey:@"CFBundleDisplayName"]; _nameLabel.text = name; NSDictionary *infoDict = [[NSBundle mainBundle] infoDictionary]; - NSString *curVersion = [NSString stringWithFormat:@"version %@",[infoDict objectForKey:@"CFBundleShortVersionString"]]; + NSString *curVersion = [NSString stringWithFormat:@"version %@-alpha.%@",[infoDict objectForKey:@"CFBundleShortVersionString"],[infoDict objectForKey:@"CFBundleVersion"]]; _appVersionLabel.text = [NSString stringWithFormat:@"%@ iOS %@", name, curVersion]; _libVersionLabel.text = [NSString stringWithFormat:@"%@ SDK %s", name, LINPHONE_SDK_VERSION]; UITapGestureRecognizer *tapGestureRecognizer = diff --git a/linphone-Info.plist b/linphone-Info.plist index 8925869e7..fff9199f5 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -24,7 +24,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.2.2 + $(MARKETING_VERSION) CFBundleURLTypes @@ -77,7 +77,7 @@ CFBundleVersion - 9 + $(CURRENT_PROJECT_VERSION) ITSAppUsesNonExemptEncryption ITSEncryptionExportComplianceCode diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index c4ad412df..472cb96fc 100644 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -5162,6 +5162,7 @@ CODE_SIGN_STYLE = Automatic; COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = Z2V957B3D6; ENABLE_BITCODE = NO; GCC_C_LANGUAGE_STANDARD = c99; @@ -5187,6 +5188,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; LINK_WITH_STANDARD_LIBRARIES = YES; + MARKETING_VERSION = 4.3.0; OTHER_CFLAGS = ( "-DBCTBX_LOG_DOMAIN=\\\"ios\\\"", "-DCHECK_VERSION_UPDATE=FALSE", @@ -5274,6 +5276,7 @@ CODE_SIGN_STYLE = Automatic; COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = Z2V957B3D6; ENABLE_BITCODE = NO; GCC_C_LANGUAGE_STANDARD = c99; @@ -5296,6 +5299,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; LINK_WITH_STANDARD_LIBRARIES = YES; + MARKETING_VERSION = 4.3.0; OTHER_CFLAGS = ( "-DBCTBX_LOG_DOMAIN=\\\"ios\\\"", "-DCHECK_VERSION_UPDATE=FALSE", @@ -5382,6 +5386,7 @@ CODE_SIGN_STYLE = Automatic; COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = Z2V957B3D6; ENABLE_BITCODE = NO; GCC_C_LANGUAGE_STANDARD = c99; @@ -5404,6 +5409,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; LINK_WITH_STANDARD_LIBRARIES = YES; + MARKETING_VERSION = 4.3.0; OTHER_CFLAGS = ( "-DBCTBX_LOG_DOMAIN=\\\"ios\\\"", "-DCHECK_VERSION_UPDATE=FALSE", @@ -5490,6 +5496,7 @@ CODE_SIGN_STYLE = Automatic; COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = Z2V957B3D6; ENABLE_BITCODE = NO; GCC_C_LANGUAGE_STANDARD = c99; @@ -5512,6 +5519,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; LINK_WITH_STANDARD_LIBRARIES = YES; + MARKETING_VERSION = 4.3.0; OTHER_CFLAGS = ( "-DBCTBX_LOG_DOMAIN=\\\"ios\\\"", "-DCHECK_VERSION_UPDATE=FALSE", @@ -6055,6 +6063,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = Z2V957B3D6; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -6065,6 +6074,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = linphoneExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MARKETING_VERSION = 4.3.0; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone.linphoneExtension; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -6095,6 +6105,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = Z2V957B3D6; ENABLE_NS_ASSERTIONS = NO; @@ -6104,6 +6115,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = linphoneExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MARKETING_VERSION = 4.3.0; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone.linphoneExtension; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -6134,6 +6146,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = Z2V957B3D6; ENABLE_NS_ASSERTIONS = NO; @@ -6143,6 +6156,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = linphoneExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MARKETING_VERSION = 4.3.0; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone.linphoneExtension; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -6174,6 +6188,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = Z2V957B3D6; ENABLE_NS_ASSERTIONS = NO; @@ -6183,6 +6198,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = linphoneExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MARKETING_VERSION = 4.3.0; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone.linphoneExtension; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/linphoneExtension/Info.plist b/linphoneExtension/Info.plist index e141cfbc8..b1d0000b0 100644 --- a/linphoneExtension/Info.plist +++ b/linphoneExtension/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 4.2.2 + $(MARKETING_VERSION) CFBundleVersion - 9 + $(CURRENT_PROJECT_VERSION) NSExtension NSExtensionAttributes