diff --git a/TopManager.xcodeproj/project.pbxproj b/TopManager.xcodeproj/project.pbxproj index 36534fc..7bcf269 100644 --- a/TopManager.xcodeproj/project.pbxproj +++ b/TopManager.xcodeproj/project.pbxproj @@ -453,12 +453,14 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = TopManager/TopManager.entitlements; COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 3; GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = TopManager/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); + MARKETING_VERSION = 1.1.1; PRODUCT_BUNDLE_IDENTIFIER = com.topmanager.app; PRODUCT_NAME = TopManager; SDKROOT = macosx; @@ -556,12 +558,14 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = TopManager/TopManager.entitlements; COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 3; GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = TopManager/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); + MARKETING_VERSION = 1.1.1; PRODUCT_BUNDLE_IDENTIFIER = com.topmanager.app; PRODUCT_NAME = TopManager; SDKROOT = macosx; diff --git a/TopManager/Info.plist b/TopManager/Info.plist index 47ef031..4968699 100644 --- a/TopManager/Info.plist +++ b/TopManager/Info.plist @@ -15,8 +15,8 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + $(MARKETING_VERSION) CFBundleVersion - 1 + $(CURRENT_PROJECT_VERSION) diff --git a/project.yml b/project.yml index ebfa48a..297a2c4 100644 --- a/project.yml +++ b/project.yml @@ -31,8 +31,15 @@ targets: GENERATE_INFOPLIST_FILE: NO SWIFT_EMIT_LOC_STRINGS: YES ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon + # The app version lives here. `xcodegen generate` rewrites Info.plist from + # the `info` block below, so a version typed into Info.plist gets reset. + MARKETING_VERSION: "1.1.1" + CURRENT_PROJECT_VERSION: "3" info: path: TopManager/Info.plist + properties: + CFBundleShortVersionString: $(MARKETING_VERSION) + CFBundleVersion: $(CURRENT_PROJECT_VERSION) TopManagerTests: type: bundle.unit-test