|
3 | 3 | archiveVersion = 1; |
4 | 4 | classes = { |
5 | 5 | }; |
6 | | - objectVersion = 46; |
| 6 | + objectVersion = 54; |
7 | 7 | objects = { |
8 | 8 |
|
9 | 9 | /* Begin PBXAggregateTarget section */ |
|
154 | 154 | 6C4855C81D57DCFC0027A7B4 /* PBTerminalUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4855C71D57DCFC0027A7B4 /* PBTerminalUtil.m */; }; |
155 | 155 | 6C4855DA1D57E4FA0027A7B4 /* PBOpenShallowRepositoryErrorRecoveryAttempter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4855D91D57E4FA0027A7B4 /* PBOpenShallowRepositoryErrorRecoveryAttempter.m */; }; |
156 | 156 | 6C5244131E00C66E0051DE20 /* PBHistorySearchMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C5244121E00C66E0051DE20 /* PBHistorySearchMode.m */; }; |
| 157 | + 7EDCE8EE2EBEFEEF0062CE78 /* AppIcon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 7EDCE8ED2EBEFEEF0062CE78 /* AppIcon.icon */; }; |
157 | 158 | 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; |
158 | 159 | 911112370E5A097800BF76B4 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 911112360E5A097800BF76B4 /* Security.framework */; }; |
159 | 160 | 913D5E500E55645900CECEA2 /* gitx in Resources */ = {isa = PBXBuildFile; fileRef = 913D5E490E55644600CECEA2 /* gitx */; }; |
|
181 | 182 | A2F8D0DF17AAB32500580B84 /* PBGitStash.m in Sources */ = {isa = PBXBuildFile; fileRef = A2F8D0DE17AAB32500580B84 /* PBGitStash.m */; }; |
182 | 183 | A2F8D0EB17AAB95E00580B84 /* PBSourceViewGitStashItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A2F8D0EA17AAB95E00580B84 /* PBSourceViewGitStashItem.m */; }; |
183 | 184 | BF42F1331E025403004769FF /* GitXTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = BF42F1321E025403004769FF /* GitXTextView.m */; }; |
184 | | - BFFCB5471E3EFA9F00E0B254 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BFFCB5461E3EFA9F00E0B254 /* Images.xcassets */; }; |
185 | 185 | D87127011229A21C00012334 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D87127001229A21C00012334 /* QuartzCore.framework */; }; |
186 | 186 | D89E9B141218BA260097A90B /* ScriptingBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D89E9AB21218A9DA0097A90B /* ScriptingBridge.framework */; }; |
187 | 187 | D8E3B2B810DC9FB2001096A3 /* ScriptingBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8E3B2B710DC9FB2001096A3 /* ScriptingBridge.framework */; }; |
|
666 | 666 | 6C5244021E00C33F0051DE20 /* PBHistorySearchMode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PBHistorySearchMode.h; sourceTree = "<group>"; }; |
667 | 667 | 6C5244121E00C66E0051DE20 /* PBHistorySearchMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBHistorySearchMode.m; sourceTree = "<group>"; }; |
668 | 668 | 77C82804067257F0000B614F /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; }; |
| 669 | + 7EDCE8ED2EBEFEEF0062CE78 /* AppIcon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = AppIcon.icon; sourceTree = "<group>"; }; |
669 | 670 | 8D1107320486CEB800E47090 /* GitX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GitX.app; sourceTree = BUILT_PRODUCTS_DIR; }; |
670 | 671 | 911112360E5A097800BF76B4 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; }; |
671 | 672 | 913D5E490E55644600CECEA2 /* gitx */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = gitx; sourceTree = BUILT_PRODUCTS_DIR; }; |
|
697 | 698 | A2F8D0EA17AAB95E00580B84 /* PBSourceViewGitStashItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBSourceViewGitStashItem.m; sourceTree = "<group>"; }; |
698 | 699 | BF42F1321E025403004769FF /* GitXTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GitXTextView.m; sourceTree = "<group>"; }; |
699 | 700 | BF42F1431E025411004769FF /* GitXTextView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GitXTextView.h; sourceTree = "<group>"; }; |
700 | | - BFFCB5461E3EFA9F00E0B254 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; }; |
701 | 701 | D87127001229A21C00012334 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; |
702 | 702 | D89E9AB21218A9DA0097A90B /* ScriptingBridge.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ScriptingBridge.framework; path = System/Library/Frameworks/ScriptingBridge.framework; sourceTree = SDKROOT; }; |
703 | 703 | D8E3B2B710DC9FB2001096A3 /* ScriptingBridge.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ScriptingBridge.framework; path = /System/Library/Frameworks/ScriptingBridge.framework; sourceTree = "<absolute>"; }; |
|
833 | 833 | 4A5D757C14A9A90500DF6C68 /* Resources */ = { |
834 | 834 | isa = PBXGroup; |
835 | 835 | children = ( |
| 836 | + 7EDCE8ED2EBEFEEF0062CE78 /* AppIcon.icon */, |
836 | 837 | 4A5D757D14A9A90500DF6C68 /* Credits.html */, |
837 | 838 | 4A5D760214A9A99E00DF6C68 /* en.lproj */, |
838 | 839 | 4A90A73414A9D24300D0DA02 /* GitX.sdef */, |
839 | 840 | 4A90A72914A9C12F00D0DA02 /* GitX_Prefix.pch */, |
840 | 841 | F5D619ED0EAE62EA00341D73 /* html */, |
841 | 842 | 4A5D758114A9A90500DF6C68 /* Images */, |
842 | | - BFFCB5461E3EFA9F00E0B254 /* Images.xcassets */, |
843 | 843 | 4A5D75B414A9A90500DF6C68 /* Info.plist */, |
844 | 844 | 4A5D75B514A9A90500DF6C68 /* source.css */, |
845 | 845 | 4A5D75B714A9A90500DF6C68 /* UpdateKey.pem */, |
|
1274 | 1274 | 29B97313FDCFA39411CA2CEA /* Project object */ = { |
1275 | 1275 | isa = PBXProject; |
1276 | 1276 | attributes = { |
| 1277 | + BuildIndependentTargetsInParallel = YES; |
1277 | 1278 | LastUpgradeCheck = 1320; |
1278 | 1279 | }; |
1279 | 1280 | buildConfigurationList = 26FC0A880875C7B200E6366F /* Build configuration list for PBXProject "GitX" */; |
|
1489 | 1490 | buildActionMask = 2147483647; |
1490 | 1491 | files = ( |
1491 | 1492 | 913D5E500E55645900CECEA2 /* gitx in Resources */, |
1492 | | - BFFCB5471E3EFA9F00E0B254 /* Images.xcassets in Resources */, |
1493 | 1493 | 551BF176112F3F4B00265053 /* gitx_askpasswd in Resources */, |
1494 | 1494 | 978357C5189C238300ADC689 /* DetailViewTemplate.pdf in Resources */, |
1495 | 1495 | 4A5D75C114A9A90500DF6C68 /* Credits.html in Resources */, |
|
1527 | 1527 | 4A5D761914A9A99E00DF6C68 /* PBAddRemoteSheet.xib in Resources */, |
1528 | 1528 | 978357BD189C19A000ADC689 /* PushTemplate.pdf in Resources */, |
1529 | 1529 | 4A5D761A14A9A99E00DF6C68 /* PBCloneRepositoryPanel.xib in Resources */, |
| 1530 | + 7EDCE8EE2EBEFEEF0062CE78 /* AppIcon.icon in Resources */, |
1530 | 1531 | 4A5D761C14A9A99E00DF6C68 /* PBCreateBranchSheet.xib in Resources */, |
1531 | 1532 | 4A5D761D14A9A99E00DF6C68 /* PBCreateTagSheet.xib in Resources */, |
1532 | 1533 | 4A5D761E14A9A99E00DF6C68 /* PBRemoteProgressSheet.xib in Resources */, |
|
1561 | 1562 | }; |
1562 | 1563 | D14A145A27B23E52008374BA /* ShellScript */ = { |
1563 | 1564 | isa = PBXShellScriptBuildPhase; |
| 1565 | + alwaysOutOfDate = 1; |
1564 | 1566 | buildActionMask = 2147483647; |
1565 | 1567 | files = ( |
1566 | 1568 | ); |
|
1574 | 1576 | ); |
1575 | 1577 | runOnlyForDeploymentPostprocessing = 0; |
1576 | 1578 | shellPath = /bin/sh; |
1577 | | - shellScript = "#!/bin/bash\n\n# This script automatically sets the version and short version string of\n# an Xcode project from the Git repository containing the project.\n#\n# To use this script in Xcode, add the script's path to a \"Run Script\" build\n# phase for your application target.\n\nset -o errexit\nset -o nounset\n\n# First, check for git in $PATH\nhash git 2>/dev/null || { echo >&2 \"Git required, not installed. Aborting build number update script.\"; exit 0; }\n\n# Alternatively, we could use Xcode's copy of the Git binary,\n# but old Xcodes don't have this.\n#GIT=$(xcrun -find git)\n\n# Run Script build phases that operate on product files of the target that defines them should use the value of this build setting [TARGET_BUILD_DIR]. But Run Script build phases that operate on product files of other targets should use “BUILT_PRODUCTS_DIR” instead.\nINFO_PLIST=\"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n\n# Build version (closest-tag-or-branch \"-\" commits-since-tag \"-\" short-hash dirty-flag)\nBUILD_VERSION=$(git describe --tags --always --dirty=+)\n\n# Use the latest tag for short version (expected tag format \"vn[.n[.n]]\")\n# or if there are no tags, we make up version 0.0.<commit count>\nLATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null)\nLATEST_TAG=${LATEST_TAG##v} # Remove the \"v\" from the front of the tag\nARCHITECTURE=$(uname -p)\nSHORT_VERSION=\"$LATEST_TAG\"\n\nMASTER_COMMIT_COUNT=$(git rev-list --count HEAD)\nBRANCH_COMMIT_COUNT=0\nBUNDLE_VERSION=\"$SHORT_VERSION\".\"$MASTER_COMMIT_COUNT [$ARCHITECTURE]\"\n\n# For debugging:\necho \"BUILD VERSION: $BUILD_VERSION\"\necho \"SHORT VERSION: $SHORT_VERSION\"\necho \"BUNDLE_VERSION: $BUNDLE_VERSION\"\n\n/usr/libexec/PlistBuddy -c \"Add :CFBundleBuildVersion string $BUILD_VERSION\" \"$INFO_PLIST\" 2>/dev/null || /usr/libexec/PlistBuddy -c \"Set :CFBundleBuildVersion $BUILD_VERSION\" \"$INFO_PLIST\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $BUILD_VERSION\" \"$INFO_PLIST\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $BUNDLE_VERSION\" \"$INFO_PLIST\"\n"; |
| 1579 | + shellScript = "#!/bin/bash\n\n# This script automatically sets the version and short version string of\n# an Xcode project from the Git repository containing the project.\n#\n# To use this script in Xcode, add the script's path to a \"Run Script\" build\n# phase for your application target.\n\nset -o errexit\nset -o nounset\n\n# Alternatively, we could use Xcode's copy of the Git binary,\n# but old Xcodes don't have this.\nGIT=$(xcrun -find git)\n\n# Run Script build phases that operate on product files of the target that defines them should use the value of this build setting [TARGET_BUILD_DIR]. But Run Script build phases that operate on product files of other targets should use “BUILT_PRODUCTS_DIR” instead.\nINFO_PLIST=\"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n\n# Build version (closest-tag-or-branch \"-\" commits-since-tag \"-\" short-hash dirty-flag)\nBUILD_VERSION=$(git describe --tags --always --dirty=+)\n\n# Use the latest tag for short version (expected tag format \"vn[.n[.n]]\")\n# or if there are no tags, we make up version 0.0.<commit count>\nLATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null)\nLATEST_TAG=${LATEST_TAG##v} # Remove the \"v\" from the front of the tag\nARCHITECTURE=$(uname -p)\nSHORT_VERSION=\"$LATEST_TAG\"\n\nMASTER_COMMIT_COUNT=$(git rev-list --count HEAD)\nBRANCH_COMMIT_COUNT=0\nBUNDLE_VERSION=\"$SHORT_VERSION\".\"$MASTER_COMMIT_COUNT [$ARCHITECTURE]\"\n\n# For debugging:\necho \"BUILD VERSION: $BUILD_VERSION\"\necho \"SHORT VERSION: $SHORT_VERSION\"\necho \"BUNDLE_VERSION: $BUNDLE_VERSION\"\n\n/usr/libexec/PlistBuddy -c \"Add :CFBundleBuildVersion string $BUILD_VERSION\" \"$INFO_PLIST\" 2>/dev/null || /usr/libexec/PlistBuddy -c \"Set :CFBundleBuildVersion $BUILD_VERSION\" \"$INFO_PLIST\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $BUILD_VERSION\" \"$INFO_PLIST\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $BUNDLE_VERSION\" \"$INFO_PLIST\"\n"; |
1578 | 1580 | }; |
1579 | 1581 | F5CF04A20EAE696C00D75C81 /* Copy HTML files */ = { |
1580 | 1582 | isa = PBXShellScriptBuildPhase; |
| 1583 | + alwaysOutOfDate = 1; |
1581 | 1584 | buildActionMask = 2147483647; |
1582 | 1585 | comments = "This is added as a script rather than a 'copy files' phase because those aren't updated correctly when you edit just a single file in a directory.\n\nThis might be improved further by using rsync, but I didn't dive into that yet."; |
1583 | 1586 | files = ( |
|
1836 | 1839 | 26FC0A850875C7B200E6366F /* Debug */ = { |
1837 | 1840 | isa = XCBuildConfiguration; |
1838 | 1841 | buildSettings = { |
1839 | | - ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-gitx"; |
| 1842 | + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; |
| 1843 | + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; |
1840 | 1844 | CODE_SIGN_ENTITLEMENTS = GitX.entitlements; |
1841 | 1845 | COMBINE_HIDPI_IMAGES = YES; |
1842 | 1846 | FRAMEWORK_SEARCH_PATHS = "\"$(PROJECT_DIR)\""; |
1843 | 1847 | GCC_DYNAMIC_NO_PIC = NO; |
1844 | 1848 | GCC_PRECOMPILE_PREFIX_HEADER = YES; |
1845 | 1849 | GCC_PREFIX_HEADER = Resources/GitX_Prefix.pch; |
1846 | 1850 | INFOPLIST_FILE = Resources/Info.plist; |
| 1851 | + INFOPLIST_KEY_CFBundleDisplayName = GitX; |
| 1852 | + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools"; |
1847 | 1853 | INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; |
1848 | 1854 | INSTALL_PATH = /Applications; |
1849 | 1855 | MACOSX_DEPLOYMENT_TARGET = 10.13; |
| 1856 | + MARKETING_VERSION = 0; |
1850 | 1857 | PRODUCT_BUNDLE_IDENTIFIER = net.phere.GitX; |
1851 | 1858 | PRODUCT_NAME = GitX; |
1852 | 1859 | VALID_ARCHS = "x86_64 arm64"; |
|
1858 | 1865 | 26FC0A860875C7B200E6366F /* Release */ = { |
1859 | 1866 | isa = XCBuildConfiguration; |
1860 | 1867 | buildSettings = { |
1861 | | - ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-gitx"; |
| 1868 | + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; |
| 1869 | + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; |
1862 | 1870 | CODE_SIGN_ENTITLEMENTS = GitX.entitlements; |
1863 | 1871 | COMBINE_HIDPI_IMAGES = YES; |
1864 | 1872 | ENABLE_HARDENED_RUNTIME = YES; |
|
1867 | 1875 | GCC_PREFIX_HEADER = Resources/GitX_Prefix.pch; |
1868 | 1876 | GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = ""; |
1869 | 1877 | INFOPLIST_FILE = Resources/Info.plist; |
| 1878 | + INFOPLIST_KEY_CFBundleDisplayName = GitX; |
| 1879 | + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools"; |
1870 | 1880 | INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; |
1871 | 1881 | INSTALL_PATH = /Applications; |
1872 | 1882 | MACOSX_DEPLOYMENT_TARGET = 10.13; |
| 1883 | + MARKETING_VERSION = 0; |
1873 | 1884 | PRODUCT_BUNDLE_IDENTIFIER = net.phere.GitX; |
1874 | 1885 | PRODUCT_NAME = GitX; |
1875 | 1886 | STRIP_INSTALLED_PRODUCT = YES; |
|
0 commit comments