diff --git a/Config/Version.xcconfig b/Config/Version.xcconfig index eeec04d7..86730971 100644 --- a/Config/Version.xcconfig +++ b/Config/Version.xcconfig @@ -1,2 +1,2 @@ -VERSION_LONG = 1.0.0.11 -VERSION_SHORT = 1.0 +VERSION_LONG = 1.0.1.3 +VERSION_SHORT = 1.0.1 diff --git a/GravatarApp.xcodeproj/project.pbxproj b/GravatarApp.xcodeproj/project.pbxproj index 12e6372a..b79c8b8f 100644 --- a/GravatarApp.xcodeproj/project.pbxproj +++ b/GravatarApp.xcodeproj/project.pbxproj @@ -402,7 +402,6 @@ LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 14.6; - MARKETING_VERSION = 1.0.0; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Gravatar iOS Development"; @@ -451,7 +450,6 @@ LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 14.6; - MARKETING_VERSION = 1.0.0; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.gravatar.GravatarApp"; @@ -590,7 +588,6 @@ LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 14.6; - MARKETING_VERSION = 1.0.0; PRODUCT_NAME = "$(TARGET_NAME)"; REGISTER_APP_GROUPS = YES; SDKROOT = auto; diff --git a/GravatarApp/CommonViews/MainMenu/AboutView.swift b/GravatarApp/CommonViews/MainMenu/AboutView.swift index c2b04681..feaaa093 100644 --- a/GravatarApp/CommonViews/MainMenu/AboutView.swift +++ b/GravatarApp/CommonViews/MainMenu/AboutView.swift @@ -12,9 +12,11 @@ struct AboutView: View { private let textColor = Color.primary.opacity(0.6) private let notificationCenter: NotificationCenter + private let bundle: Bundle - init(notificationCenter: NotificationCenter = .default) { + init(notificationCenter: NotificationCenter = .default, bundle: Bundle = .main) { self.notificationCenter = notificationCenter + self.bundle = bundle } var body: some View { @@ -141,7 +143,7 @@ struct AboutView: View { } func getAppVersion() -> String { - if let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String { + if let appVersion = bundle.infoDictionary?["CFBundleShortVersionString"] as? String { return appVersion } return "?" diff --git a/GravatarAppTests/ModalsTests/AboutModalTests.swift b/GravatarAppTests/ModalsTests/AboutModalTests.swift index 958b0e81..ddc6d3f7 100644 --- a/GravatarAppTests/ModalsTests/AboutModalTests.swift +++ b/GravatarAppTests/ModalsTests/AboutModalTests.swift @@ -5,14 +5,27 @@ import SnapshotTesting import SwiftUI import Testing +// Mock Bundle for testing that provides consistent version info +class MockBundle: Bundle { + override var infoDictionary: [String: Any]? { + [ + "CFBundleShortVersionString": "1.0.0", + ] + } +} + @Suite(.snapshots(record: .failed, diffTool: .ksdiff)) @MainActor struct AboutModalTests { @Test() func AboutModal() async throws { let modalManager = ModalPresentationManager() + + // Create a mock bundle with version info for testing + let mockBundle = MockBundle() + modalManager.present { - AboutView() + AboutView(bundle: mockBundle) .environment(\.analytics, Analytics.test) }