From 6563e68b0b0b4533849d44672638deeaae1d036f Mon Sep 17 00:00:00 2001
From: Dallas Groot <me@dallasgroot.ca>
Date: Wed, 8 Apr 2026 15:34:14 -0700
Subject: [PATCH] fixed testflight again

---
 project.yml | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/project.yml b/project.yml
index fc4c18b..fc095c3 100644
--- a/project.yml
+++ b/project.yml
@@ -1,10 +1,11 @@
 name: NavidromePlayer
 options:
+  # Aligned the prefix to match your iOS target base
   bundleIdPrefix: ca.dallasgroot.navidromeplayer
   deploymentTarget:
-    iOS: "17.0" # Adjusted to realistic 2026 targets
-    watchOS: "10.0"
-  xcodeVersion: "15.0" # Standard stable Xcode versioning
+    iOS: "26.0"
+    watchOS: "26.0"
+  xcodeVersion: "26.0"
   groupSortPosition: top
   createIntermediateGroups: true
 
@@ -17,11 +18,10 @@ settings:
   base:
     SWIFT_VERSION: "5.9"
     MARKETING_VERSION: "1.0.0"
-    CURRENT_PROJECT_VERSION: "1" # Always a string for safety
+    CURRENT_PROJECT_VERSION: "1"
     DEAD_CODE_STRIPPING: true
     ENABLE_USER_SCRIPT_SANDBOXING: true
     DEVELOPMENT_TEAM: E9C9AGS9K6
-    CODE_SIGN_STYLE: Manual # Recommended for CI/CD, or 'Automatic' for local Xcode use
 
 targets:
   # ─────────────────────────────────────
@@ -30,6 +30,7 @@ targets:
   NavidromePlayer:
     type: application
     platform: iOS
+    deploymentTarget: "26.0"
     sources:
       - path: iOS
       - path: Shared
@@ -37,17 +38,16 @@ targets:
       - path: iOS/Resources
     settings:
       base:
-        PRODUCT_BUNDLE_IDENTIFIER: ca.dallasgroot.navidromeplayer
+        # Kept your original iOS bundle ID
+        PRODUCT_BUNDLE_IDENTIFIER: ca.dallasgroot.navidromeplayer.app
         INFOPLIST_FILE: iOS/Resources/Info.plist
         CODE_SIGN_ENTITLEMENTS: iOS/Resources/NavidromePlayer.entitlements
         ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon
         TARGETED_DEVICE_FAMILY: "1,2"
-        # Required for App Store:
-        ENABLE_BITCODE: NO
-        CODE_SIGN_IDENTITY: "Apple Distribution"
-        PROVISIONING_PROFILE_SPECIFIER: "NavidromePlayer_App_Store"
+        SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD: true
     dependencies:
       - target: NavidromeWatch
+        embed: true # FIX 1: Ensures the watch app is packaged inside the iOS app
       - package: ZIPFoundation
 
   # ─────────────────────────────────────
@@ -56,6 +56,7 @@ targets:
   NavidromeWatch:
     type: application
     platform: watchOS
+    deploymentTarget: "26.0"
     sources:
       - path: watchOS
       - path: Shared
@@ -63,20 +64,27 @@ targets:
       - path: watchOS/Resources
     settings:
       base:
-        # CRITICAL: The Watch bundle ID must be prefixed by the iOS bundle ID
-        PRODUCT_BUNDLE_IDENTIFIER: ca.dallasgroot.navidromeplayer.watchkitapp
+        # FIX 2: Watch ID MUST start exactly with the iOS ID for TestFlight
+        PRODUCT_BUNDLE_IDENTIFIER: ca.dallasgroot.navidromeplayer.app.watchkitapp
         INFOPLIST_FILE: watchOS/Resources/Info.plist
         CODE_SIGN_ENTITLEMENTS: watchOS/Resources/NavidromeWatch.entitlements
         ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon
-        SKIP_INSTALL: false
-        CODE_SIGN_IDENTITY: "Apple Distribution"
-        PROVISIONING_PROFILE_SPECIFIER: "NavidromeWatch_App_Store"
+        WATCHOS_DEPLOYMENT_TARGET: "26.0"
+        SKIP_INSTALL: true # FIX 3: Prevents the generic archive issue
 
 schemes:
   NavidromePlayer:
     build:
       targets:
         NavidromePlayer: all
+        NavidromeWatch: all
+    run:
+      config: Debug
+    test:
+      config: Debug
+    profile:
+      config: Release
+    analyze:
+      config: Debug
     archive:
       config: Release
-    # Ensure the archive action captures the iOS app (which includes the Watch app)