stop using git commit sha for CFBundleVersion because it confuses spa…

…rkle
codykrieger · Nov 22, 2020 · 5cb13a5 · 5cb13a5
1 parent aac0c0e
commit 5cb13a5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/gfxCardStatus.xcodeproj/project.pbxproj b/gfxCardStatus.xcodeproj/project.pbxproj
@@ -440,7 +440,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
-			shellScript = "# based on http://tgoode.com/2014/06/05/sensible-way-increment-bundle-version-cfbundleversion-xcode\nif git rev-parse --is-inside-work-tree 2> /dev/null > /dev/null; then\n    commit_sha=\"$(git rev-parse HEAD | head -c 7)\"\n    if ! git diff --no-ext-diff --quiet --exit-code ; then\n        suffix=\"-dirty\"\n    fi\n    bundle_version=\"${commit_sha}${suffix}\"\n    echo \"Setting CFBundleVersion: $bundle_version\"\n    /usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $bundle_version\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\nelse\n    echo \"Not in a Git repo, not setting CFBundleVersion\"\nfi\n";
+			shellScript = "# based on http://tgoode.com/2014/06/05/sensible-way-increment-bundle-version-cfbundleversion-xcode\nif git rev-parse --is-inside-work-tree 2> /dev/null > /dev/null; then\n    bundle_version=\"$(git rev-list --count HEAD)\"\n    echo \"Setting CFBundleVersion: $bundle_version\"\n    /usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $bundle_version\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\nelse\n    echo \"Not in a Git repo, not setting CFBundleVersion\"\nfi\n";
 		};
 		595E0F18A384F7D84DB3DC56 /* Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -597,7 +597,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 2.5b2;
+				MARKETING_VERSION = 2.5b3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -634,7 +634,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 2.5b2;
+				MARKETING_VERSION = 2.5b3;
 				OTHER_CFLAGS = (
 					"$(inherited)",
 					"-DNDEBUG",