BIT-58: Update Info.plists to use MARKETING_VERSION and CURRENT_PROJE…

…CT_VERSION
bitwarden · Sep 1, 2023 · 512bfd2 · 512bfd2
1 parent 03e7b95
commit 512bfd2
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/Bitwarden/Application/Support/Info.plist b/Bitwarden/Application/Support/Info.plist
@@ -13,9 +13,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2023.7.1</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>CFBundleIconName</key>
 	<string>AppIcon</string>
 	<key>CFBundlePackageType</key>

diff --git a/BitwardenAutoFillExtension/Application/Support/Info.plist b/BitwardenAutoFillExtension/Application/Support/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2023.7.1</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>CFBundleLocalizations</key>
 	<array>
 		<string>en</string>

diff --git a/BitwardenShareExtension/Application/Support/Info.plist b/BitwardenShareExtension/Application/Support/Info.plist
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2023.7.1</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>

diff --git a/Scripts/update_settings_version_number.sh b/Scripts/update_settings_version_number.sh
@@ -6,7 +6,7 @@ set -e
 
 SETTINGS_BUNDLE_PATH="${CODESIGNING_FOLDER_PATH}/Settings.bundle/Root.plist"
 BUILD_VERSION=$(sed -n '/MARKETING_VERSION/{s/MARKETING_VERSION = //;s/;//;s/^[[:space:]]*//;p;q;}' "${PROJECT_FILE_PATH}/project.pbxproj")
-BUILD_NUMBER=$(/usr/libexec/PlistBuddy -c "Print CFBundleVersion" "${INFOPLIST_FILE}")
+BUILD_NUMBER=$(sed -n '/CURRENT_PROJECT_VERSION/{s/CURRENT_PROJECT_VERSION = //;s/;//;s/^[[:space:]]*//;p;q;}' "${PROJECT_FILE_PATH}/project.pbxproj")
 BUILD_STRING="${BUILD_VERSION} (${BUILD_NUMBER})"
 
 /usr/libexec/PlistBuddy -c "Set PreferenceSpecifiers:0:DefaultValue $BUILD_STRING" "${SETTINGS_BUNDLE_PATH}"
diff --git a/project.yml b/project.yml
@@ -94,7 +94,8 @@ targets:
       Debug: Configs/Bitwarden-Debug.xcconfig
       Release: Configs/Bitwarden-Release.xcconfig
     settings:
-      INFOPLIST_FILE: Bitwarden/Application/Support/Info.plist
+      base:
+        INFOPLIST_FILE: Bitwarden/Application/Support/Info.plist
     sources:
       - path: Bitwarden
         excludes:
@@ -164,8 +165,9 @@ targets:
       Debug: Configs/BitwardenActionExtension.xcconfig
       Release: Configs/BitwardenActionExtension.xcconfig
     settings:
-      CODE_SIGN_ENTITLEMENTS: BitwardenActionExtension/Application/Support/BitwardenActionExtension.entitlements
-      INFOPLIST_FILE: BitwardenActionExtension/Application/Support/Info.plist
+      base:
+        CODE_SIGN_ENTITLEMENTS: BitwardenActionExtension/Application/Support/BitwardenActionExtension.entitlements
+        INFOPLIST_FILE: BitwardenActionExtension/Application/Support/Info.plist
     sources:
       - path: BitwardenActionExtension
         excludes:
@@ -199,8 +201,9 @@ targets:
       Debug: Configs/BitwardenAutoFillExtension.xcconfig
       Release: Configs/BitwardenAutoFillExtension.xcconfig
     settings:
-      CODE_SIGN_ENTITLEMENTS: BitwardenAutoFillExtension/Application/Support/BitwardenAutoFill.entitlements
-      INFOPLIST_FILE: BitwardenAutoFillExtension/Application/Support/Info.plist
+      base:
+        CODE_SIGN_ENTITLEMENTS: BitwardenAutoFillExtension/Application/Support/BitwardenAutoFill.entitlements
+        INFOPLIST_FILE: BitwardenAutoFillExtension/Application/Support/Info.plist
     sources:
       - path: BitwardenAutoFillExtension
         excludes:
@@ -234,8 +237,9 @@ targets:
       Debug: Configs/BitwardenShareExtension.xcconfig
       Release: Configs/BitwardenShareExtension.xcconfig
     settings:
-      CODE_SIGN_ENTITLEMENTS: BitwardenShareExtension/Application/Support/BitwardenShareExtension.entitlements
-      INFOPLIST_FILE: BitwardenShareExtension/Application/Support/Info.plist
+      base:
+        CODE_SIGN_ENTITLEMENTS: BitwardenShareExtension/Application/Support/BitwardenShareExtension.entitlements
+        INFOPLIST_FILE: BitwardenShareExtension/Application/Support/Info.plist
     sources:
       - path: BitwardenShareExtension
         excludes: