From ffd7ca612545fb32547b63bad26424ce83ebb159 Mon Sep 17 00:00:00 2001
From: Daniel Arantes Loverde <daniel@loverde.com.br>
Date: Thu, 9 Jul 2026 14:07:57 -0300
Subject: [PATCH] [ci-bitrise] Fix envs and versioning to match this project's
 actual config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

agvtool doesn't apply here — no VERSIONING_SYSTEM set, CURRENT_PROJECT_VERSION
comes from Skip.env (shared with the Android side) via #include in
Darwin/PediFoods.xcconfig. Bump it there instead.

Dropped APPLE_ID, ITC_TEAM_ID and unused BITRISE_DISTRIBUTION_METHOD carried
over from LC Wallet's Fastfile/Appfile shape — none of them are read anywhere
in this project's Appfile or Fastfile.

Added the actual missing piece: DEVELOPMENT_TEAM, which both
Darwin/PediFoods.xcconfig and Darwin/fastlane/AppStore.xcconfig leave blank
on purpose for CI to fill in. Wired BITRISE_DISTRIBUTION_METHOD into
build_app's export_method so it stops being dead config.
---
 Darwin/fastlane/Fastfile |  1 +
 bitrise.yml              | 40 ++++++++++++++++++----------------------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/Darwin/fastlane/Fastfile b/Darwin/fastlane/Fastfile
index b46138e..cfc6f8f 100644
--- a/Darwin/fastlane/Fastfile
+++ b/Darwin/fastlane/Fastfile
@@ -10,6 +10,7 @@ lane :assemble do |options|
   build_app(
     scheme: "PediFoods App",
     sdk: "iphoneos",
+    export_method: ENV["BITRISE_DISTRIBUTION_METHOD"] || "app-store",
     xcconfig: "fastlane/AppStore.xcconfig",
     xcargs: "-skipPackagePluginValidation -skipMacroValidation",
     derived_data_path: "../.build/Darwin/DerivedData",
diff --git a/bitrise.yml b/bitrise.yml
index 68d07a7..7481006 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -9,21 +9,16 @@ meta:
 
 app:
   envs:
-    - BITRISE_PROJECT_PATH: Darwin/PediFoods.xcodeproj
-      opts:
-        is_expand: false
-    - BITRISE_SCHEME: PediFoods App
-      opts:
-        is_expand: false
     - BITRISE_DISTRIBUTION_METHOD: app-store
       opts:
         is_expand: false
-    - APPLE_ID: developer@loverde.com.br
     # MANUAL (Bitrise Secrets tab — never commit these):
     #   ASC_KEY_ID        → App Store Connect API Key ID
     #   ASC_ISSUER_ID     → App Store Connect Issuer ID
-    #   ASC_KEY_CONTENT   → .p8 file content (raw, not base64 — written verbatim into apikey.json)
-    #   ITC_TEAM_ID       → iTunes Connect Team ID (numeric)
+    #   ASC_KEY_CONTENT   → .p8 file content (raw, written verbatim into apikey.json)
+    #   DEVELOPMENT_TEAM  → Apple Developer Team ID, written into
+    #                       Darwin/fastlane/AppStore.xcconfig at build time
+    #                       (Darwin/PediFoods.xcconfig leaves it blank on purpose)
 
 # ─── WORKFLOWS ────────────────────────────────────────────────────────────────
 workflows:
@@ -38,11 +33,16 @@ workflows:
           inputs:
             - content: |
                 cd $BITRISE_SOURCE_DIR
-                agvtool new-version -all $BITRISE_BUILD_NUMBER
+                # CURRENT_PROJECT_VERSION lives in Skip.env — shared by both
+                # Darwin/PediFoods.xcconfig and Android/settings.gradle.kts,
+                # not a standard Xcode "Apple Generic Versioning" setting,
+                # so agvtool does not apply here.
+                sed -i '' "s/CURRENT_PROJECT_VERSION = .*/CURRENT_PROJECT_VERSION = $BITRISE_BUILD_NUMBER/" Skip.env
       - script@1:
-          title: Write App Store Connect API key
+          title: Write code signing team and App Store Connect API key
           inputs:
             - content: |
+                echo "DEVELOPMENT_TEAM = $DEVELOPMENT_TEAM" >> "$BITRISE_SOURCE_DIR/Darwin/fastlane/AppStore.xcconfig"
                 cat > "$BITRISE_SOURCE_DIR/Darwin/fastlane/apikey.json" <<EOF
                 {"key_id":"$ASC_KEY_ID","issuer_id":"$ASC_ISSUER_ID","key":"$ASC_KEY_CONTENT","in_house":false}
                 EOF
@@ -54,33 +54,29 @@ workflows:
   # ── Full release → App Store ───────────────────────────────────────────────
   release:
     description: Build, sign, and upload to App Store
-    envs:
-      - ASC_KEY_ID: $ASC_KEY_ID
-      - ASC_ISSUER_ID: $ASC_ISSUER_ID
-      - ASC_KEY_CONTENT: $ASC_KEY_CONTENT
     steps:
       - git-clone@8: {}
       - script@1:
-          title: Verify ASC secrets
+          title: Verify secrets
           inputs:
             - content: |
-                if [ -z "$ASC_KEY_ID" ]; then
-                  echo "ERROR: ASC_KEY_ID is empty"
+                if [ -z "$ASC_KEY_ID" ] || [ -z "$DEVELOPMENT_TEAM" ]; then
+                  echo "ERROR: ASC_KEY_ID / ASC_ISSUER_ID / ASC_KEY_CONTENT / DEVELOPMENT_TEAM must be set in Bitrise Secrets"
                   exit 1
                 fi
                 echo "ASC_KEY_ID is set (length: ${#ASC_KEY_ID})"
-                echo "ASC_ISSUER_ID is set (length: ${#ASC_ISSUER_ID})"
-                echo "ASC_KEY_CONTENT is set (length: ${#ASC_KEY_CONTENT})"
+                echo "DEVELOPMENT_TEAM is set (length: ${#DEVELOPMENT_TEAM})"
       - script@1:
           title: Set build number
           inputs:
             - content: |
                 cd $BITRISE_SOURCE_DIR
-                agvtool new-version -all $BITRISE_BUILD_NUMBER
+                sed -i '' "s/CURRENT_PROJECT_VERSION = .*/CURRENT_PROJECT_VERSION = $BITRISE_BUILD_NUMBER/" Skip.env
       - script@1:
-          title: Write App Store Connect API key
+          title: Write code signing team and App Store Connect API key
           inputs:
             - content: |
+                echo "DEVELOPMENT_TEAM = $DEVELOPMENT_TEAM" >> "$BITRISE_SOURCE_DIR/Darwin/fastlane/AppStore.xcconfig"
                 cat > "$BITRISE_SOURCE_DIR/Darwin/fastlane/apikey.json" <<EOF
                 {"key_id":"$ASC_KEY_ID","issuer_id":"$ASC_ISSUER_ID","key":"$ASC_KEY_CONTENT","in_house":false}
                 EOF