xgem-cli 2.0.0-alpha.4 → 2.0.0-alpha.6

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

package/lib/flutter.sh

@@ -105,7 +105,7 @@ _flutter_build_ios() {
     mkdir -p "$archive_dir"
     archive_path="$archive_dir/Runner $archive_time.xcarchive"
 
-    if ! xcodebuild -workspace ios/Runner.xcworkspace \
+    local -a archive_cmd=(xcodebuild -workspace ios/Runner.xcworkspace \
         -scheme Runner \
         -sdk iphoneos \
         -configuration Release \
@@ -113,10 +113,35 @@ _flutter_build_ios() {
         -archivePath "$archive_path" \
         "BUILD_NUMBER=$build_number" \
         "MARKETING_VERSION=$build_name" \
-        -allowProvisioningUpdates > "$log_file" 2>&1; then
-        log_error "Archive FAILED"
-        cat "$log_file"
-        die "xcodebuild archive failed" "$?"
+        -allowProvisioningUpdates)
+
+    if ! "${archive_cmd[@]}" > "$log_file" 2>&1; then
+        # Static pre-checks can miss cases the real SwiftPM resolution
+        # catches (different plugin manifest layouts, symlinked package
+        # dirs, etc.) — Xcode's own error is authoritative, so parse it
+        # directly and retry once before giving up.
+        local retry_required
+        retry_required=$(ios_parse_required_from_build_log "$log_file")
+        if [ -n "$retry_required" ]; then
+            log_warn "Archive failed on a SwiftPM platform-version mismatch Xcode reports directly (requires iOS $retry_required). Retrying with that applied..."
+            ios_pbxproj_patch_deployment_target "$retry_required" "."
+            ios_regenerate_generated_package "."
+            local regenerated
+            regenerated=$(ios_generated_package_target ".")
+            if [ -z "$regenerated" ] || _ios_ver_lt "$regenerated" "$retry_required"; then
+                ios_patch_generated_package_target "$retry_required" "."
+            fi
+
+            if ! "${archive_cmd[@]}" > "$log_file" 2>&1; then
+                log_error "Archive FAILED again after retry"
+                cat "$log_file"
+                die "xcodebuild archive failed" "$?"
+            fi
+        else
+            log_error "Archive FAILED"
+            cat "$log_file"
+            die "xcodebuild archive failed" "$?"
+        fi
     fi
     log_success "Archive created at: $archive_path"
 

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,36 @@ 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
+        # -L: per-plugin dirs here are frequently symlinks into pub-cache;
+        # without -L, find silently skips descending into them.
+        find -L "$packages_dir" -maxdepth 4 -name "Package.swift" -print0 2>/dev/null \
+            | xargs -0 grep -ohE '\.iOS\(\.v[0-9_]+\)|\.iOS\("[0-9.]+"\)' 2>/dev/null \
+            | grep -oE '[0-9]+(\.[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; }
 
@@ -118,9 +144,12 @@ for pkg in data.get("packages", []):
     except OSError:
         continue
 
-    for m in re.finditer(r"\.iOS\(\.v(\d+(?:_\d+)?)\)", content):
+    # Both SPM syntaxes: enum .iOS(.v15) and string .iOS("15.0") (the form
+    # Flutter's own generator uses).
+    for m in re.finditer(r'\.iOS\(\.v(\d+(?:_\d+)?)\)|\.iOS\("(\d+(?:\.\d+)?)"\)', content):
+        raw = m.group(1) or m.group(2)
         try:
-            fv = float(m.group(1).replace("_", "."))
+            fv = float(raw.replace("_", "."))
         except ValueError:
             continue
         max_target = max(max_target, fv)
@@ -164,21 +193,40 @@ ios_generated_package_swift_path() {
         echo "$guess"
         return 0
     fi
-    find "$project_dir/ios" -maxdepth 6 -type f -name "Package.swift" \
+    # -L: plugin package directories under ephemeral/Packages/.packages are
+    # frequently symlinks into the pub-cache; a plain find silently skips
+    # symlinked directories instead of descending into them.
+    find -L "$project_dir/ios" -maxdepth 6 -type f -name "Package.swift" \
         -path "*FlutterGeneratedPluginSwiftPackage*" 2>/dev/null | head -1
 }
 
+# SPM's SupportedPlatform.iOS accepts two syntaxes: the enum form .iOS(.v15)
+# for the fixed known-version cases, and a string form .iOS("15.0") for
+# arbitrary versions — Flutter's own code generator uses the *string* form
+# for FlutterGeneratedPluginSwiftPackage, not the enum form. Matching only
+# the enum form (as an earlier version of this function did) means the
+# patch step silently never matches anything on a real generated package:
+# sed finds no match, writes back an identical file, and "succeeds" while
+# doing nothing.
+_ios_extract_platform_version() {
+    grep -oE '\.iOS\(\.v[0-9_]+\)|\.iOS\("[0-9.]+"\)' | head -1 \
+        | grep -oE '[0-9]+(\.[0-9]+)?(_[0-9]+)?' | tr '_' '.'
+}
+
 ios_generated_package_target() {
     local project_dir=${1:-.}
     local pkg
     pkg=$(ios_generated_package_swift_path "$project_dir")
     [ -n "$pkg" ] && [ -f "$pkg" ] || return 1
-    grep -oE '\.iOS\(\.v[0-9_]+\)' "$pkg" | head -1 | grep -oE '[0-9_]+' | tr '_' '.'
+    _ios_extract_platform_version < "$pkg"
 }
 
 # Last-resort workaround for the still-open upstream desync bug: directly
 # patch the generated package's platform declaration. Always logged loudly
 # — this is a documented workaround for a known bug, never a silent hack.
+# Writes the string form (.iOS("15.0")) since that's what Flutter's own
+# generator uses in this file — matching its existing convention rather
+# than introducing a different syntax.
 ios_patch_generated_package_target() {
     local new_target=$1
     local project_dir=${2:-.}
@@ -190,10 +238,9 @@ ios_patch_generated_package_target() {
     fi
 
     log_warn "Working around known Flutter SPM bug (flutter/flutter#186804): the regenerated package still doesn't match your deployment target, so patching it directly."
-    local token=${new_target//./_}
     local tmp
     tmp=$(mktemp)
-    sed -E "s/\.iOS\(\.v[0-9_]+\)/.iOS(.v${token})/g" "$pkg" > "$tmp"
+    sed -E "s/\.iOS\(\.v[0-9_]+\)/.iOS(\"${new_target}\")/g; s/\.iOS\(\"[0-9.]+\"\)/.iOS(\"${new_target}\")/g" "$pkg" > "$tmp"
     mv "$tmp" "$pkg"
     log_success "Patched generated package platform to iOS $new_target."
 }
@@ -205,6 +252,21 @@ ios_regenerate_generated_package() {
     ( cd "$project_dir" && flutter pub get )
 }
 
+# ios_parse_required_from_build_log <log_file>
+# Statically scanning plugin manifests to predict the required deployment
+# target has proven unreliable in practice (plugin authors structure SPM
+# manifests differently, package dirs can be symlinks, etc.). Xcode itself
+# always computes this correctly and states it plainly in its own error:
+# "requires minimum platform version X for the iOS platform". Parsing that
+# directly is the authoritative fallback when the static pre-check misses
+# something.
+ios_parse_required_from_build_log() {
+    local log_file=$1
+    grep -oE "requires minimum platform version [0-9]+(\.[0-9]+)?" "$log_file" 2>/dev/null \
+        | grep -oE '[0-9]+(\.[0-9]+)?' \
+        | sort -g | tail -1
+}
+
 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 — independently, even when the app's own target is already high enough. Currently open — xgem detects and works around it automatically below."
 }

package/lib/version.sh

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xgem-cli",
-  "version": "2.0.0-alpha.4",
+  "version": "2.0.0-alpha.6",
   "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"