Merge pull request #566 from 64characters/xcode-11

Xcode 11
64characters · Mar 16, 2020 · 2115c82 · 2115c82
2 parents 1dd34bf + d55e26d
commit 2115c82
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Telephone.xcodeproj/project.pbxproj b/Telephone.xcodeproj/project.pbxproj
@@ -5511,6 +5511,7 @@
 				CODE_SIGN_ENTITLEMENTS = Telephone/Telephone.entitlements;
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 132;
 				DEVELOPMENT_TEAM = B5WSA37RY8;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -5527,6 +5528,7 @@
 					"\"$(SRCROOT)/ThirdParty/PJSIP/lib\"",
 					"\"$(SRCROOT)/ThirdParty/Opus/lib\"",
 				);
+				MARKETING_VERSION = 1.4;
 				OTHER_LDFLAGS = (
 					"-lpjsua-x86_64-apple-darwin",
 					"-lpjsip-ua-x86_64-apple-darwin",
@@ -5560,6 +5562,7 @@
 				CODE_SIGN_ENTITLEMENTS = Telephone/Telephone.entitlements;
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 132;
 				DEVELOPMENT_TEAM = B5WSA37RY8;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = "PJ_AUTOCONF=1";
@@ -5573,6 +5576,7 @@
 					"\"$(SRCROOT)/ThirdParty/PJSIP/lib\"",
 					"\"$(SRCROOT)/ThirdParty/Opus/lib\"",
 				);
+				MARKETING_VERSION = 1.4;
 				OTHER_LDFLAGS = (
 					"-lpjsua-x86_64-apple-darwin",
 					"-lpjsip-ua-x86_64-apple-darwin",

diff --git a/Telephone/Info.plist b/Telephone/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -38,7 +38,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>132</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>