xgem-cli 2.0.0-alpha.3 → 2.0.0-alpha.5

package/lib/doctor.sh

@@ -26,7 +26,10 @@ flutter_supports_flag() {
 flutter_config_spm_enabled() {
     has_cmd flutter || { echo "unknown (flutter not found)"; return; }
     local line
-    line=$(flutter config 2>/dev/null | grep -i "swift-package-manager")
+    # Anchored to "enable-swift-package-manager:" (the current-value line)
+    # so this doesn't instead match the "--[no-]enable-swift-package-manager"
+    # flag-syntax help line that `flutter config` also prints.
+    line=$(flutter config 2>/dev/null | grep -im1 -E '^[[:space:]]*enable-swift-package-manager:')
     if [ -z "$line" ]; then
         echo "unknown (not reported by this Flutter version)"
     else
@@ -86,7 +89,7 @@ doctor_print_ios() {
         echo "Deployment target [$cfg]: ${t:-unknown}"
     done
 
-    local required
+    local required generated
     required=$(ios_required_spm_deployment_target "$project_dir" 2>/dev/null)
     if [ -n "$required" ]; then
         echo "Required by resolved SwiftPM plugins: $required"
@@ -94,6 +97,14 @@ doctor_print_ios() {
         echo "Required by resolved SwiftPM plugins: unable to determine (run 'flutter pub get' first, or no SPM plugins declare an explicit floor)"
     fi
 
+    if [ "$uses_spm" = "yes" ]; then
+        generated=$(ios_generated_package_target "$project_dir" 2>/dev/null)
+        echo "FlutterGeneratedPluginSwiftPackage declares: ${generated:-unknown}"
+        if [ -n "$required" ] && [ -n "$generated" ] && _ios_ver_lt "$generated" "$required"; then
+            log_warn "This is stale — it declares iOS $generated but plugins need $required. This can happen even when your app's own deployment target is already high enough; 'xgem run flutter build' will detect and fix this."
+        fi
+    fi
+
     if [ "$uses_spm" = "yes" ]; then
         ios_known_issue_check
     fi

package/lib/flutter.sh

@@ -66,14 +66,19 @@ _flutter_build_ios() {
 
     require_cmd xcodebuild "iOS builds require Xcode's command-line tools."
 
+    # Must run pub get BEFORE reconciling: the required-deployment-target
+    # check reads .dart_tool/package_config.json, and that file only
+    # reflects the plugin versions actually in use after a fresh pub get.
+    # Reconciling against a stale package_config.json can silently pass a
+    # check that the real, just-resolved dependency graph would fail.
+    log_info "Regenerating dependencies..."
+    flutter pub get
+
     log_info "Reconciling iOS deployment target against resolved SwiftPM plugins..."
     if ! ios_reconcile_deployment_target "."; then
         die "iOS deployment target could not be reconciled; aborting before build."
     fi
 
-    log_info "Regenerating dependencies..."
-    flutter pub get
-
     if ios_project_uses_pods "."; then
         log_info "CocoaPods detected - installing pods..."
         ( cd ios || exit 1; pod install )

package/lib/ios.sh

@@ -60,8 +60,13 @@ ios_deployment_target_for_config() {
 
     if has_cmd xcodebuild; then
         local value
+        # Anchored: newer Xcode also emits DEPLOYMENT_TARGET_SETTING_NAME =
+        # IPHONEOS_DEPLOYMENT_TARGET (a meta-setting whose *value* is that
+        # string), which an unanchored grep matches before the real
+        # "IPHONEOS_DEPLOYMENT_TARGET = 15.6" line — anchoring to the key
+        # position avoids grabbing that decoy.
         value=$(xcodebuild -showBuildSettings "${xcb_args[@]}" -configuration "$config" 2>/dev/null \
-            | grep -m1 'IPHONEOS_DEPLOYMENT_TARGET' | awk '{print $NF}')
+            | grep -m1 -E '^[[:space:]]*IPHONEOS_DEPLOYMENT_TARGET[[:space:]]*=' | awk '{print $NF}')
         [ -n "$value" ] && { echo "$value"; return 0; }
     fi
 
@@ -80,15 +85,34 @@ ios_pbxproj_current_max_target() {
 }
 
 # ios_required_spm_deployment_target [project_dir]
-# Reads .dart_tool/package_config.json (written by `flutter pub get`) to
-# find every resolved package's own ios/Package.swift, and returns the
-# highest .iOS(.vNN) platform floor declared across them. This replaces
-# hardcoding a guessed value (e.g. "15.0") with an actual measurement of
-# what the resolved dependency graph requires.
+# Returns the highest .iOS(.vNN) platform floor declared across every
+# resolved SwiftPM plugin, instead of hardcoding a guessed value.
+#
+# Primary source: ios/Flutter/ephemeral/Packages/.packages/<name>-<version>/,
+# which `flutter pub get` itself populates with each SPM-enabled plugin as
+# part of dependency resolution — this is the actual, already-resolved
+# location Xcode/SPM uses, not a path we have to reconstruct. Scanning it
+# directly sidesteps having to guess each plugin's on-disk manifest layout
+# (which varies — not every plugin puts Package.swift at <root>/ios/).
+#
+# Falls back to parsing .dart_tool/package_config.json's rootUri entries
+# (assuming the common <root>/ios/Package.swift convention) only if that
+# ephemeral directory doesn't exist yet — e.g. before any pub get has run.
 ios_required_spm_deployment_target() {
     local project_dir=${1:-.}
-    local pkg_config="$project_dir/.dart_tool/package_config.json"
+    local packages_dir="$project_dir/ios/Flutter/ephemeral/Packages/.packages"
+
+    if [ -d "$packages_dir" ]; then
+        find "$packages_dir" -maxdepth 4 -name "Package.swift" -print0 2>/dev/null \
+            | xargs -0 grep -ohE '\.iOS\(\.v[0-9_]+\)' 2>/dev/null \
+            | grep -oE '[0-9]+(_[0-9]+)?' | tr '_' '.' \
+            | sort -g | tail -1
+        return 0
+    fi
 
+    log_debug "No resolved SwiftPM packages directory at $packages_dir yet; falling back to package_config.json."
+
+    local pkg_config="$project_dir/.dart_tool/package_config.json"
     [ -f "$pkg_config" ] || { log_debug "No .dart_tool/package_config.json — run flutter pub get first."; return 1; }
     has_cmd python3 || { log_debug "python3 not found; cannot parse package_config.json."; return 1; }
 
@@ -206,13 +230,23 @@ ios_regenerate_generated_package() {
 }
 
 ios_known_issue_check() {
-    log_warn "Known upstream issue (flutter/flutter#186804, #189422, #162072): FlutterGeneratedPluginSwiftPackage's deployment target can desync from your app's IPHONEOS_DEPLOYMENT_TARGET. Currently open — xgem detects and works around it automatically below."
+    log_warn "Known upstream issue (flutter/flutter#186804, #189422, #162072): FlutterGeneratedPluginSwiftPackage's deployment target can desync from your app's IPHONEOS_DEPLOYMENT_TARGET — independently, even when the app's own target is already high enough. Currently open — xgem detects and works around it automatically below."
+}
+
+# _ios_ver_lt a b -> true if a < b, numeric comparison (not string equality,
+# since "15" and "15.0" are the same version but different strings).
+_ios_ver_lt() {
+    awk -v a="$1" -v b="$2" 'BEGIN{exit !(a<b)}'
 }
 
 # ios_reconcile_deployment_target [project_dir]
-# The core "self-healing" step: detect a required-vs-current mismatch, plan
-# the fix, confirm (unless --yes/--dry-run), apply, regenerate, verify, and
-# fall back to the documented workaround if the upstream bug is still biting.
+# The core "self-healing" step. Checks TWO independent things against the
+# required version — the app's own pbxproj target, AND
+# FlutterGeneratedPluginSwiftPackage's own declared platform — because the
+# upstream bug is exactly that these two can desync from each other. A
+# project whose pbxproj is already at (say) 15.6 can still have a generated
+# package stuck at 13.0; checking only the pbxproj target (as an earlier
+# version of this function did) misses that case entirely.
 # Returns 0 if no action was needed or the fix succeeded; 1 if it couldn't
 # reconcile and the caller should stop before attempting a build.
 ios_reconcile_deployment_target() {
@@ -220,46 +254,53 @@ ios_reconcile_deployment_target() {
 
     ios_project_uses_spm "$project_dir" || { log_debug "Project does not use SwiftPM; skipping deployment-target reconciliation."; return 0; }
 
-    local required current
+    local required
     required=$(ios_required_spm_deployment_target "$project_dir")
-    current=$(ios_deployment_target_for_config "Release" "$project_dir")
-
     if [ -z "$required" ]; then
         log_debug "Could not determine a required deployment target from resolved SPM plugins; skipping reconciliation."
         return 0
     fi
-    if [ -z "$current" ]; then
-        log_warn "Could not determine the project's current deployment target; proceeding without reconciliation."
+
+    ios_known_issue_check
+
+    local current generated
+    current=$(ios_deployment_target_for_config "Release" "$project_dir")
+    generated=$(ios_generated_package_target "$project_dir")
+
+    local pbxproj_needs_bump=0 generated_needs_fix=0
+    [ -n "$current" ] && _ios_ver_lt "$current" "$required" && pbxproj_needs_bump=1
+    if [ -z "$generated" ] || _ios_ver_lt "$generated" "$required"; then
+        generated_needs_fix=1
+    fi
+
+    if [ "$pbxproj_needs_bump" = 0 ] && [ "$generated_needs_fix" = 0 ]; then
+        log_debug "Deployment target ($current) and generated package ($generated) already satisfy SwiftPM requirement ($required)."
         return 0
     fi
 
-    ios_known_issue_check
+    log_warn "Resolved SwiftPM plugins require iOS $required."
+    [ "$pbxproj_needs_bump" = 1 ] && echo "  - project.pbxproj currently targets iOS $current"
+    [ "$generated_needs_fix" = 1 ] && echo "  - FlutterGeneratedPluginSwiftPackage currently declares iOS ${generated:-unknown}"
+    echo "Plan:"
+    [ "$pbxproj_needs_bump" = 1 ] && echo "  1. Set IPHONEOS_DEPLOYMENT_TARGET = $required across every build configuration in project.pbxproj"
+    echo "  2. Clear ios/Flutter/ephemeral and re-run 'flutter pub get' to regenerate FlutterGeneratedPluginSwiftPackage"
+    echo "  3. Verify the regenerated package declares iOS $required; if it still doesn't (known upstream bug), patch it directly"
+
+    if ! confirm "Apply this fix?"; then
+        log_warn "Skipped. The build will likely fail SwiftPM resolution until this is reconciled manually."
+        return 1
+    fi
+
+    [ "$pbxproj_needs_bump" = 1 ] && ios_pbxproj_patch_deployment_target "$required" "$project_dir"
+    ios_regenerate_generated_package "$project_dir"
 
-    if awk -v a="$required" -v b="$current" 'BEGIN{exit !(a>b)}'; then
-        log_warn "Resolved SwiftPM plugins require iOS $required, but the project targets iOS $current."
-        echo "Plan:"
-        echo "  1. Set IPHONEOS_DEPLOYMENT_TARGET = $required across every build configuration in project.pbxproj"
-        echo "  2. Clear ios/Flutter/ephemeral and re-run 'flutter pub get' to regenerate FlutterGeneratedPluginSwiftPackage"
-        echo "  3. Verify the regenerated package declares iOS $required; if it still doesn't (known upstream bug), patch it directly"
-
-        if ! confirm "Apply this fix?"; then
-            log_warn "Skipped. The build will likely fail SwiftPM resolution until the deployment target is reconciled manually."
-            return 1
-        fi
-
-        ios_pbxproj_patch_deployment_target "$required" "$project_dir"
-        ios_regenerate_generated_package "$project_dir"
-
-        local regenerated
-        regenerated=$(ios_generated_package_target "$project_dir")
-        if [ "$regenerated" = "$required" ]; then
-            log_success "Generated package now correctly declares iOS $regenerated."
-        else
-            log_warn "Generated package declares '${regenerated:-unknown}' after regeneration, not $required."
-            ios_patch_generated_package_target "$required" "$project_dir"
-        fi
+    local regenerated
+    regenerated=$(ios_generated_package_target "$project_dir")
+    if [ -n "$regenerated" ] && ! _ios_ver_lt "$regenerated" "$required"; then
+        log_success "Generated package now correctly declares iOS $regenerated."
     else
-        log_debug "Deployment target ($current) already satisfies SwiftPM requirement ($required)."
+        log_warn "Generated package declares '${regenerated:-unknown}' after regeneration, still below $required."
+        ios_patch_generated_package_target "$required" "$project_dir"
     fi
 
     return 0

package/lib/version.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # xgem version info.
 
-XGEM_VERSION="2.0.0-alpha"
+XGEM_VERSION="2.0.0-alpha.5"
 
 print_version() {
     echo "xgem $XGEM_VERSION"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xgem-cli",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.5",
   "description": "Framework-aware automation CLI: scaffolds and runs clean/build/dev scripts per project type, an environment doctor, a SwiftPM-aware iOS build engine, and a git workflow helper. Runs natively on macOS, Linux, and Windows.",
   "bin": {
     "xgem": "bin/xgem.js"