From 89c0782d25cb729d60fcb753ef38b7b311f42722 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Wed, 20 Aug 2025 10:19:08 +0100 Subject: [PATCH 1/7] Update version as 1.0.1 --- Config/Version.xcconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config/Version.xcconfig b/Config/Version.xcconfig index eeec04d7..cc42df2d 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.0 +VERSION_SHORT = 1.0.1 From cfca5c96dcb7fa37c10a0deb3c1fae7c7030eaa5 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Wed, 20 Aug 2025 10:29:02 +0100 Subject: [PATCH 2/7] [skip ci] Bump build code --- Config/Version.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config/Version.xcconfig b/Config/Version.xcconfig index cc42df2d..00a8d42f 100644 --- a/Config/Version.xcconfig +++ b/Config/Version.xcconfig @@ -1,2 +1,2 @@ -VERSION_LONG = 1.0.1.0 +VERSION_LONG = 1.0.1.1 VERSION_SHORT = 1.0.1 From 148836ffe36c07178633406d7d533912930dc6c8 Mon Sep 17 00:00:00 2001 From: Eduardo Toledo Date: Wed, 20 Aug 2025 11:59:42 +0200 Subject: [PATCH 3/7] Update version to 1.0.1 in project file --- GravatarApp.xcodeproj/project.pbxproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GravatarApp.xcodeproj/project.pbxproj b/GravatarApp.xcodeproj/project.pbxproj index 12e6372a..02493ccf 100644 --- a/GravatarApp.xcodeproj/project.pbxproj +++ b/GravatarApp.xcodeproj/project.pbxproj @@ -402,7 +402,7 @@ 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; + MARKETING_VERSION = 1.0.1; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Gravatar iOS Development"; @@ -451,7 +451,7 @@ 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; + MARKETING_VERSION = 1.0.1; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.gravatar.GravatarApp"; @@ -590,7 +590,7 @@ 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; + MARKETING_VERSION = 1.0.1; PRODUCT_NAME = "$(TARGET_NAME)"; REGISTER_APP_GROUPS = YES; SDKROOT = auto; From 3942240e5127d6e1358746a006d3f4ab1056a294 Mon Sep 17 00:00:00 2001 From: Eduardo Toledo Date: Wed, 20 Aug 2025 11:59:57 +0200 Subject: [PATCH 4/7] [skip ci] Bump build code --- Config/Version.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config/Version.xcconfig b/Config/Version.xcconfig index 00a8d42f..9e4fe691 100644 --- a/Config/Version.xcconfig +++ b/Config/Version.xcconfig @@ -1,2 +1,2 @@ -VERSION_LONG = 1.0.1.1 +VERSION_LONG = 1.0.1.2 VERSION_SHORT = 1.0.1 From 342f9892a2384c813f8689715f4a1d67360ae808 Mon Sep 17 00:00:00 2001 From: "Ian G. Maia" Date: Wed, 20 Aug 2025 12:04:47 +0200 Subject: [PATCH 5/7] Marketing version fix (#117) --- GravatarApp.xcodeproj/project.pbxproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/GravatarApp.xcodeproj/project.pbxproj b/GravatarApp.xcodeproj/project.pbxproj index 02493ccf..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.1; 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.1; 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.1; PRODUCT_NAME = "$(TARGET_NAME)"; REGISTER_APP_GROUPS = YES; SDKROOT = auto; From c27bf6738f75a02913773d4657182c66e931b4b0 Mon Sep 17 00:00:00 2001 From: "Ian G. Maia" Date: Wed, 20 Aug 2025 13:19:48 +0200 Subject: [PATCH 6/7] Fix `AboutModalTests` unit tests (#118) --- GravatarApp/CommonViews/MainMenu/AboutView.swift | 6 ++++-- .../ModalsTests/AboutModalTests.swift | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) 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) } From 2a0874cc8ecc12e38c344bddedd6be0df178819c Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Wed, 20 Aug 2025 12:55:45 +0100 Subject: [PATCH 7/7] [skip ci] Bump build code --- Config/Version.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config/Version.xcconfig b/Config/Version.xcconfig index 9e4fe691..86730971 100644 --- a/Config/Version.xcconfig +++ b/Config/Version.xcconfig @@ -1,2 +1,2 @@ -VERSION_LONG = 1.0.1.2 +VERSION_LONG = 1.0.1.3 VERSION_SHORT = 1.0.1