From 5cb13a5fe377c8e6b789eb06dcfcdbbec45c407f Mon Sep 17 00:00:00 2001 From: Cody Krieger Date: Sat, 21 Nov 2020 16:51:50 -0800 Subject: [PATCH] stop using git commit sha for CFBundleVersion because it confuses sparkle --- gfxCardStatus.xcodeproj/project.pbxproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gfxCardStatus.xcodeproj/project.pbxproj b/gfxCardStatus.xcodeproj/project.pbxproj index dff672e..3639858 100644 --- 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",