diff --git a/TESTING.md b/TESTING.md index 3cac859..8682f19 100644 --- a/TESTING.md +++ b/TESTING.md @@ -155,7 +155,7 @@ xcodebuild \ archive ``` -Verify the archived app reports version `1.0` and a positive build number, is +Verify the archived app reports version `1.1` and a positive build number, is signed for distribution with the expected bundle identifier and entitlements, contains `PrivacyInfo.xcprivacy`, and declares the correct export-compliance answer before uploading it to App Store Connect for notarization. diff --git a/ios/Gotcha.xcodeproj/project.pbxproj b/ios/Gotcha.xcodeproj/project.pbxproj index 7c51937..0f5f57c 100644 --- a/ios/Gotcha.xcodeproj/project.pbxproj +++ b/ios/Gotcha.xcodeproj/project.pbxproj @@ -402,7 +402,6 @@ CODE_SIGN_ENTITLEMENTS = Gotcha.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = MU22FMRGK8; INFOPLIST_FILE = Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 17.0; @@ -411,7 +410,6 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited) $(DERIVED_FILE_DIR)/rust"; - MARKETING_VERSION = 1.0; OTHER_LDFLAGS = "$(inherited) -lgotcha_core"; PRODUCT_BUNDLE_IDENTIFIER = de.rfc1437.gotcha; SDKROOT = iphoneos; @@ -428,7 +426,6 @@ CODE_SIGN_ENTITLEMENTS = Gotcha.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = MU22FMRGK8; INFOPLIST_FILE = Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 17.0; @@ -437,7 +434,6 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited) $(DERIVED_FILE_DIR)/rust"; - MARKETING_VERSION = 1.0; OTHER_LDFLAGS = "$(inherited) -lgotcha_core"; PRODUCT_BUNDLE_IDENTIFIER = de.rfc1437.gotcha; SDKROOT = iphoneos; @@ -481,6 +477,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -499,6 +496,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + MARKETING_VERSION = 1.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -569,6 +567,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -581,6 +580,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + MARKETING_VERSION = 1.1; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/ios/GotchaWidgets-Info.plist b/ios/GotchaWidgets-Info.plist index 97a8895..0654326 100644 --- a/ios/GotchaWidgets-Info.plist +++ b/ios/GotchaWidgets-Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.0 + $(MARKETING_VERSION) CFBundleVersion - 1 + $(CURRENT_PROJECT_VERSION) ITSAppUsesNonExemptEncryption NSExtension diff --git a/ios/project.yml b/ios/project.yml index d6ecb95..5a7e13c 100644 --- a/ios/project.yml +++ b/ios/project.yml @@ -3,6 +3,8 @@ options: bundleIdPrefix: de.rfc1437 settings: ENABLE_USER_SCRIPT_SANDBOXING: NO + MARKETING_VERSION: "1.1" + CURRENT_PROJECT_VERSION: "1" packages: Highlighter: url: https://github.com/smittytone/HighlighterSwift @@ -17,8 +19,6 @@ targets: deploymentTarget: "17.0" settings: PRODUCT_BUNDLE_IDENTIFIER: de.rfc1437.gotcha - MARKETING_VERSION: "1.0" - CURRENT_PROJECT_VERSION: "1" DEVELOPMENT_TEAM: MU22FMRGK8 CODE_SIGN_STYLE: Automatic TARGETED_DEVICE_FAMILY: "1" @@ -81,6 +81,8 @@ targets: path: GotchaWidgets-Info.plist properties: CFBundleDisplayName: Gotcha Widgets + CFBundleShortVersionString: "$(MARKETING_VERSION)" + CFBundleVersion: "$(CURRENT_PROJECT_VERSION)" ITSAppUsesNonExemptEncryption: false NSExtension: NSExtensionPointIdentifier: com.apple.widgetkit-extension