@jacques_gordon/expo-mapbox-navigation 2.2.9 → 2.2.11

package/app.plugin.js

@@ -172,8 +172,9 @@ def _expo_mapbox_nav_add_spm(installer)
 
   pkg_class = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference
   ref_class = Xcodeproj::Project::Object::XCSwiftPackageProductDependency
+  dep_class = Xcodeproj::Project::Object::PBXTargetDependency
 
-  # ── Step 1: Add to pods_project (where ExpoMapboxNavigation target lives) ──
+  # ── Step 1: Add package + products to pods_project ────────────────────────
   pods_project = installer.pods_project
 
   pkg = pods_project.root_object.package_references.find { |p|
@@ -187,42 +188,64 @@ def _expo_mapbox_nav_add_spm(installer)
     puts '[ExpoMapboxNavigation] Added mapbox-navigation-ios to pods_project'
   end
 
-  # ── FIX: Stronger target lookup with fallback ──────────────────────────────
-  # CocoaPods normally names the target exactly 'ExpoMapboxNavigation'.
-  # Deduplication suffixes (e.g. 'ExpoMapboxNavigation-abc123') only happen
-  # when the same pod is included in multiple targets with different specs,
-  # which is not our case. We still add an include? fallback to be safe.
   expo_target = pods_project.targets.find { |t| t.name == 'ExpoMapboxNavigation' }
   expo_target ||= pods_project.targets.find { |t| t.name.include?('ExpoMapboxNavigation') }
   if expo_target
     puts "[ExpoMapboxNavigation] Found target: #{expo_target.name}"
     products.each do |product_name|
-      ref = expo_target.package_product_dependencies.find { |r|
+      # 1. package_product_dependencies — registers SPM product on target
+      prod_ref = expo_target.package_product_dependencies.find { |r|
         r.class == ref_class && r.package == pkg && r.product_name == product_name
       }
-      unless ref
-        ref = pods_project.new(ref_class)
-        ref.package      = pkg
-        ref.product_name = product_name
-        expo_target.package_product_dependencies << ref
-        puts "[ExpoMapboxNavigation] Linked #{product_name} -> #{expo_target.name}"
+      unless prod_ref
+        prod_ref = pods_project.new(ref_class)
+        prod_ref.package      = pkg
+        prod_ref.product_name = product_name
+        expo_target.package_product_dependencies << prod_ref
+        puts "[ExpoMapboxNavigation] Added package_product_dependency: #{product_name}"
+      end
+    end
+
+    # ── SWIFT_INCLUDE_PATHS fix ──────────────────────────────────────────────
+    # SPM compiles .swiftmodule into ${PODS_CONFIGURATION_BUILD_DIR}.
+    # Without adding this path, Xcode throws "no such module MapboxNavigationCore".
+    # Source: https://trinhngocthuyen.com/posts/tech/spm-with-cocoapods/
+    expo_target.build_configurations.each do |config|
+      existing = config.build_settings['SWIFT_INCLUDE_PATHS'] || '$(inherited)'
+      unless existing.include?('PODS_CONFIGURATION_BUILD_DIR')
+        config.build_settings['SWIFT_INCLUDE_PATHS'] =
+          "#{existing} \"${PODS_CONFIGURATION_BUILD_DIR}\""
+        puts "[ExpoMapboxNavigation] Added PODS_CONFIGURATION_BUILD_DIR to SWIFT_INCLUDE_PATHS (#{config.name})"
       end
     end
   else
-    # Debug: print all available targets so we can fix the name if needed
     puts '[ExpoMapboxNavigation] WARNING: ExpoMapboxNavigation target not found!'
     puts '[ExpoMapboxNavigation] Available targets:'
     pods_project.targets.each { |t| puts "  - #{t.name}" }
   end
   pods_project.save
 
-  # ── NOTE: We do NOT add products to the user app target ────────────────────
-  # Adding MapboxNavigationCore/UIKit directly to the app target causes
-  # "Multiple commands produce" errors for MapboxCommon, MapboxCoreMaps, Turf
-  # because @rnmapbox/maps already embeds them via CocoaPods/SPM.
-  # The ExpoMapboxNavigation pod target is sufficient: when CocoaPods links
-  # the pod into the app, SPM resolves the transitive dependencies correctly
-  # without re-embedding them.
+  # ── Step 2: Register package reference in user_project (persists) ─────────
+  # Pods.xcodeproj is rebuilt every pod install — our Step 1 must survive via
+  # the workspace SPM graph. Registering the XCRemoteSwiftPackageReference in
+  # user_project (Navio.xcodeproj) ensures Xcode resolves the package into
+  # the workspace cache, making products available to Pods.xcodeproj targets.
+  # We do NOT add product dependencies to the app target — that caused
+  # "Multiple commands produce" in v2.2.8 (duplicate embed with @rnmapbox/maps).
+  installer.aggregate_targets.each do |agg|
+    user_project = agg.user_project
+    user_pkg = user_project.root_object.package_references.find { |p|
+      p.class == pkg_class && p.repositoryURL == url
+    }
+    unless user_pkg
+      user_pkg = user_project.new(pkg_class)
+      user_pkg.repositoryURL = url
+      user_pkg.requirement   = requirement
+      user_project.root_object.package_references << user_pkg
+      puts "[ExpoMapboxNavigation] Registered package ref in #{user_project.path.basename}"
+    end
+    user_project.save
+  end
 end
 `;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jacques_gordon/expo-mapbox-navigation",
-  "version": "2.2.9",
+  "version": "2.2.11",
   "description": "Expo module for Mapbox Navigation SDK with 16KB page size support, NDK27, and Mapbox Maps v11.11.0+",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/plugin/src/index.js

@@ -172,8 +172,9 @@ def _expo_mapbox_nav_add_spm(installer)
 
   pkg_class = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference
   ref_class = Xcodeproj::Project::Object::XCSwiftPackageProductDependency
+  dep_class = Xcodeproj::Project::Object::PBXTargetDependency
 
-  # ── Step 1: Add to pods_project (where ExpoMapboxNavigation target lives) ──
+  # ── Step 1: Add package + products to pods_project ────────────────────────
   pods_project = installer.pods_project
 
   pkg = pods_project.root_object.package_references.find { |p|
@@ -187,42 +188,64 @@ def _expo_mapbox_nav_add_spm(installer)
     puts '[ExpoMapboxNavigation] Added mapbox-navigation-ios to pods_project'
   end
 
-  # ── FIX: Stronger target lookup with fallback ──────────────────────────────
-  # CocoaPods normally names the target exactly 'ExpoMapboxNavigation'.
-  # Deduplication suffixes (e.g. 'ExpoMapboxNavigation-abc123') only happen
-  # when the same pod is included in multiple targets with different specs,
-  # which is not our case. We still add an include? fallback to be safe.
   expo_target = pods_project.targets.find { |t| t.name == 'ExpoMapboxNavigation' }
   expo_target ||= pods_project.targets.find { |t| t.name.include?('ExpoMapboxNavigation') }
   if expo_target
     puts "[ExpoMapboxNavigation] Found target: #{expo_target.name}"
     products.each do |product_name|
-      ref = expo_target.package_product_dependencies.find { |r|
+      # 1. package_product_dependencies — registers SPM product on target
+      prod_ref = expo_target.package_product_dependencies.find { |r|
         r.class == ref_class && r.package == pkg && r.product_name == product_name
       }
-      unless ref
-        ref = pods_project.new(ref_class)
-        ref.package      = pkg
-        ref.product_name = product_name
-        expo_target.package_product_dependencies << ref
-        puts "[ExpoMapboxNavigation] Linked #{product_name} -> #{expo_target.name}"
+      unless prod_ref
+        prod_ref = pods_project.new(ref_class)
+        prod_ref.package      = pkg
+        prod_ref.product_name = product_name
+        expo_target.package_product_dependencies << prod_ref
+        puts "[ExpoMapboxNavigation] Added package_product_dependency: #{product_name}"
+      end
+    end
+
+    # ── SWIFT_INCLUDE_PATHS fix ──────────────────────────────────────────────
+    # SPM compiles .swiftmodule into ${PODS_CONFIGURATION_BUILD_DIR}.
+    # Without adding this path, Xcode throws "no such module MapboxNavigationCore".
+    # Source: https://trinhngocthuyen.com/posts/tech/spm-with-cocoapods/
+    expo_target.build_configurations.each do |config|
+      existing = config.build_settings['SWIFT_INCLUDE_PATHS'] || '$(inherited)'
+      unless existing.include?('PODS_CONFIGURATION_BUILD_DIR')
+        config.build_settings['SWIFT_INCLUDE_PATHS'] =
+          "#{existing} \"${PODS_CONFIGURATION_BUILD_DIR}\""
+        puts "[ExpoMapboxNavigation] Added PODS_CONFIGURATION_BUILD_DIR to SWIFT_INCLUDE_PATHS (#{config.name})"
       end
     end
   else
-    # Debug: print all available targets so we can fix the name if needed
     puts '[ExpoMapboxNavigation] WARNING: ExpoMapboxNavigation target not found!'
     puts '[ExpoMapboxNavigation] Available targets:'
     pods_project.targets.each { |t| puts "  - #{t.name}" }
   end
   pods_project.save
 
-  # ── NOTE: We do NOT add products to the user app target ────────────────────
-  # Adding MapboxNavigationCore/UIKit directly to the app target causes
-  # "Multiple commands produce" errors for MapboxCommon, MapboxCoreMaps, Turf
-  # because @rnmapbox/maps already embeds them via CocoaPods/SPM.
-  # The ExpoMapboxNavigation pod target is sufficient: when CocoaPods links
-  # the pod into the app, SPM resolves the transitive dependencies correctly
-  # without re-embedding them.
+  # ── Step 2: Register package reference in user_project (persists) ─────────
+  # Pods.xcodeproj is rebuilt every pod install — our Step 1 must survive via
+  # the workspace SPM graph. Registering the XCRemoteSwiftPackageReference in
+  # user_project (Navio.xcodeproj) ensures Xcode resolves the package into
+  # the workspace cache, making products available to Pods.xcodeproj targets.
+  # We do NOT add product dependencies to the app target — that caused
+  # "Multiple commands produce" in v2.2.8 (duplicate embed with @rnmapbox/maps).
+  installer.aggregate_targets.each do |agg|
+    user_project = agg.user_project
+    user_pkg = user_project.root_object.package_references.find { |p|
+      p.class == pkg_class && p.repositoryURL == url
+    }
+    unless user_pkg
+      user_pkg = user_project.new(pkg_class)
+      user_pkg.repositoryURL = url
+      user_pkg.requirement   = requirement
+      user_project.root_object.package_references << user_pkg
+      puts "[ExpoMapboxNavigation] Registered package ref in #{user_project.path.basename}"
+    end
+    user_project.save
+  end
 end
 `;