Merge branch 'main' into fix/app-review/2026-07-resubmission

Darwin/PediFoods.xcodeproj/project.pbxproj

@@ -196,6 +196,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 496EB72F2A6AE4DE00C1253B /* PediFoods.xcconfig */;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "Apple Distribution";
+				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = K4E5BZMM4V;
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_KEY_CFBundleDisplayName = "Pedi Foods";
@@ -204,6 +206,7 @@
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
+				PROVISIONING_PROFILE_SPECIFIER = "com.br.pedifoods.app AppStore";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				TARGETED_DEVICE_FAMILY = 1;

Darwin/fastlane/Fastfile

@@ -7,12 +7,27 @@ default_platform(:ios)
 lane :assemble do |options|
   # only build the iOS side of the app
   ENV["SKIP_ZERO"] = "true"
+
+  # Manual signing (team/identity/profile) for the "PediFoods App" target is
+  # baked directly into PediFoods.xcodeproj's own project settings - not
+  # overridden here. A command-line xcargs/update_code_signing_settings
+  # override applies to the entire build graph, including the SPM package's
+  # own ephemeral targets (PediFoods, pedi-foods_PediFoods) which explicitly
+  # reject provisioning profiles and must stay Automatic; there's no way to
+  # scope a global override to just one target, and update_code_signing_settings
+  # itself can't parse this project's newer .pbxproj format anyway (gem
+  # limitation, not fixable by updating the gem).
+  # agvtool needs VERSIONING_SYSTEM = apple-generic, which this project doesn't
+  # set, so it silently no-ops - pass CURRENT_PROJECT_VERSION directly instead.
+  xcargs = "-skipPackagePluginValidation -skipMacroValidation"
+  xcargs += " CURRENT_PROJECT_VERSION=#{ENV['BUILD_NUMBER']}" if ENV["BUILD_NUMBER"]
+
   build_app(
     scheme: "PediFoods App",
     sdk: "iphoneos",
     export_method: ENV["BITRISE_DISTRIBUTION_METHOD"] || "app-store",
     xcconfig: "fastlane/AppStore.xcconfig",
-    xcargs: "-skipPackagePluginValidation -skipMacroValidation",
+    xcargs: xcargs,
     derived_data_path: "../.build/Darwin/DerivedData",
     output_directory: "../.build/fastlane/Darwin",
     skip_archive: ENV["FASTLANE_SKIP_ARCHIVE"] == "YES",
@@ -48,7 +63,8 @@ lane :release do |options|
   upload_to_app_store(
     api_key_path: "fastlane/apikey.json",
     app_rating_config_path: "fastlane/metadata/rating.json",
-    release_notes: { default: "Fixes and improvements." }
+    release_notes: { default: "Fixes and improvements." },
+    submit_for_review: false
   )
 end