@baeckerherz/expo-mapbox-navigation 0.1.18 → 0.1.20

package/ios/ExpoMapboxNavigation.podspec

@@ -24,11 +24,4 @@ Pod::Spec.new do |s|
     'SWIFT_COMPILATION_MODE' => 'wholemodule',
   }
 
-  # Mapbox Navigation SDK v3 is SPM-only. The SPM binary xcframeworks are
-  # resolved in the Pods project but the app target must link them because
-  # this pod is a static library and cannot link dynamic frameworks itself.
-  s.user_target_xcconfig = {
-    'OTHER_LDFLAGS' => '$(inherited) -framework "MapboxNavigationNative" -framework "MapboxCommon" -framework "MapboxCoreMaps"',
-    'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "$(BUILT_PRODUCTS_DIR)/PackageFrameworks"',
-  }
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baeckerherz/expo-mapbox-navigation",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "description": "Expo module wrapping Mapbox Navigation SDK v3 for iOS and Android",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/plugin/build/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_plugins_1 = require("@expo/config-plugins");
+const withMapboxNavSPM_1 = require("./withMapboxNavSPM");
 const withMapboxNavPodfile_1 = require("./withMapboxNavPodfile");
 const withMapboxNavGradle_1 = require("./withMapboxNavGradle");
 const withMapboxNavGradleProperties_1 = require("./withMapboxNavGradleProperties");
@@ -24,9 +25,13 @@ const withMapboxNavigation = (config, { mapboxAccessToken, mapboxSecretToken, na
     config.ios.infoPlist.NSLocationAlwaysAndWhenInUseUsageDescription =
         config.ios.infoPlist.NSLocationAlwaysAndWhenInUseUsageDescription ||
             "This app needs your location for turn-by-turn navigation, including in the background.";
-    // iOS: Adds Mapbox Navigation SPM to the Pods project and sets search paths
-    // so ExpoMapboxNavigation can import Mapbox modules. CocoaPods persists the
-    // changes automatically; xcodebuild resolves SPM during the build.
+    // iOS: Add Mapbox Navigation SPM to the app project for linking + embedding.
+    // This is the single source of truth for binary xcframework embedding,
+    // preventing duplicate signatures during archiving.
+    config = (0, withMapboxNavSPM_1.withMapboxNavSPM)(config, { navigationSdkVersion });
+    // iOS: Add SPM package ref + product deps (without linking) to the Pods
+    // project so ExpoMapboxNavigation compiles after SPM targets are built.
+    // Also sets search paths for module visibility.
     config = (0, withMapboxNavPodfile_1.withMapboxNavPodfile)(config, { navigationSdkVersion });
     // Android: Mapbox Maven repository and optional token for SDK download
     config = (0, withMapboxNavGradle_1.withMapboxNavGradle)(config);

package/plugin/build/withMapboxNavPodfile.d.ts

@@ -4,16 +4,14 @@ interface PodfileOptions {
 }
 /**
  * Injects a post_install hook that:
- *  1. Adds Mapbox Navigation SDK as an SPM dependency to the Pods Xcode project
- *     and links it to the ExpoMapboxNavigation pod target.
+ *  1. Adds Mapbox Navigation SDK as an SPM package reference in the Pods project
+ *     with product dependencies on ExpoMapboxNavigation (for build ordering and
+ *     module visibility) but WITHOUT PBXBuildFile entries — linking and embedding
+ *     is handled by withMapboxNavSPM in the app project to avoid duplicate
+ *     xcframework signatures during archiving.
  *  2. Sets FRAMEWORK_SEARCH_PATHS / SWIFT_INCLUDE_PATHS so the pod can find
  *     SPM-built frameworks (including transitive deps like MapboxDirections).
  *  3. Enables BUILD_LIBRARY_FOR_DISTRIBUTION on Mapbox/Turf targets.
- *
- * CocoaPods writes the Pods project to disk after post_install returns, so
- * all in-memory modifications are persisted automatically — no explicit
- * project.save or xcodebuild call needed. xcodebuild resolves SPM packages
- * as part of its normal build, which works on both local and EAS clean builds.
  */
 export declare const withMapboxNavPodfile: ConfigPlugin<PodfileOptions>;
 export {};

package/plugin/build/withMapboxNavPodfile.js

@@ -45,16 +45,14 @@ const MAPBOX_NAV_PRODUCTS = [
 const PLUGIN_MARKER = "# @baeckerherz/expo-mapbox-navigation:";
 /**
  * Injects a post_install hook that:
- *  1. Adds Mapbox Navigation SDK as an SPM dependency to the Pods Xcode project
- *     and links it to the ExpoMapboxNavigation pod target.
+ *  1. Adds Mapbox Navigation SDK as an SPM package reference in the Pods project
+ *     with product dependencies on ExpoMapboxNavigation (for build ordering and
+ *     module visibility) but WITHOUT PBXBuildFile entries — linking and embedding
+ *     is handled by withMapboxNavSPM in the app project to avoid duplicate
+ *     xcframework signatures during archiving.
  *  2. Sets FRAMEWORK_SEARCH_PATHS / SWIFT_INCLUDE_PATHS so the pod can find
  *     SPM-built frameworks (including transitive deps like MapboxDirections).
  *  3. Enables BUILD_LIBRARY_FOR_DISTRIBUTION on Mapbox/Turf targets.
- *
- * CocoaPods writes the Pods project to disk after post_install returns, so
- * all in-memory modifications are persisted automatically — no explicit
- * project.save or xcodebuild call needed. xcodebuild resolves SPM packages
- * as part of its normal build, which works on both local and EAS clean builds.
  */
 const withMapboxNavPodfile = (config, { navigationSdkVersion }) => {
     return (0, config_plugins_1.withDangerousMod)(config, [
@@ -64,7 +62,7 @@ const withMapboxNavPodfile = (config, { navigationSdkVersion }) => {
             let contents = fs.readFileSync(podfilePath, "utf8");
             const versionEscaped = navigationSdkVersion.replace(/'/g, "\\\\'");
             const hook = `
-    ${PLUGIN_MARKER} SPM in Pods + search paths + BUILD_LIBRARY_FOR_DISTRIBUTION
+    ${PLUGIN_MARKER} SPM in Pods (deps only) + search paths + BUILD_LIBRARY_FOR_DISTRIBUTION
     mapbox_nav_version = '${versionEscaped}'
     installer.pods_project.targets.each do |target|
       if target.name.start_with?('Mapbox') || target.name == 'Turf'
@@ -100,11 +98,6 @@ const withMapboxNavPodfile = (config, { navigationSdkVersion }) => {
         dep.package = pkg_ref
         dep.product_name = '${name}'
         emn_target.package_product_dependencies << dep
-        if emn_target.frameworks_build_phases
-          bf = project.new(Xcodeproj::Project::Object::PBXBuildFile)
-          bf.product_ref = dep
-          emn_target.frameworks_build_phases.files << bf
-        end
       end`).join("")}
     end`;
             const escapedMarker = PLUGIN_MARKER.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");

package/plugin/src/index.ts

@@ -1,4 +1,5 @@
 import { ConfigPlugin, createRunOncePlugin } from "@expo/config-plugins";
+import { withMapboxNavSPM } from "./withMapboxNavSPM";
 import { withMapboxNavPodfile } from "./withMapboxNavPodfile";
 import { withMapboxNavGradle } from "./withMapboxNavGradle";
 import { withMapboxNavGradleProperties } from "./withMapboxNavGradleProperties";
@@ -43,9 +44,14 @@ const withMapboxNavigation: ConfigPlugin<PluginConfig> = (
     config.ios.infoPlist.NSLocationAlwaysAndWhenInUseUsageDescription ||
     "This app needs your location for turn-by-turn navigation, including in the background.";
 
-  // iOS: Adds Mapbox Navigation SPM to the Pods project and sets search paths
-  // so ExpoMapboxNavigation can import Mapbox modules. CocoaPods persists the
-  // changes automatically; xcodebuild resolves SPM during the build.
+  // iOS: Add Mapbox Navigation SPM to the app project for linking + embedding.
+  // This is the single source of truth for binary xcframework embedding,
+  // preventing duplicate signatures during archiving.
+  config = withMapboxNavSPM(config, { navigationSdkVersion });
+
+  // iOS: Add SPM package ref + product deps (without linking) to the Pods
+  // project so ExpoMapboxNavigation compiles after SPM targets are built.
+  // Also sets search paths for module visibility.
   config = withMapboxNavPodfile(config, { navigationSdkVersion });
 
   // Android: Mapbox Maven repository and optional token for SDK download

package/plugin/src/withMapboxNavPodfile.ts

@@ -16,16 +16,14 @@ interface PodfileOptions {
 
 /**
  * Injects a post_install hook that:
- *  1. Adds Mapbox Navigation SDK as an SPM dependency to the Pods Xcode project
- *     and links it to the ExpoMapboxNavigation pod target.
+ *  1. Adds Mapbox Navigation SDK as an SPM package reference in the Pods project
+ *     with product dependencies on ExpoMapboxNavigation (for build ordering and
+ *     module visibility) but WITHOUT PBXBuildFile entries — linking and embedding
+ *     is handled by withMapboxNavSPM in the app project to avoid duplicate
+ *     xcframework signatures during archiving.
  *  2. Sets FRAMEWORK_SEARCH_PATHS / SWIFT_INCLUDE_PATHS so the pod can find
  *     SPM-built frameworks (including transitive deps like MapboxDirections).
  *  3. Enables BUILD_LIBRARY_FOR_DISTRIBUTION on Mapbox/Turf targets.
- *
- * CocoaPods writes the Pods project to disk after post_install returns, so
- * all in-memory modifications are persisted automatically — no explicit
- * project.save or xcodebuild call needed. xcodebuild resolves SPM packages
- * as part of its normal build, which works on both local and EAS clean builds.
  */
 export const withMapboxNavPodfile: ConfigPlugin<PodfileOptions> = (
   config,
@@ -43,7 +41,7 @@ export const withMapboxNavPodfile: ConfigPlugin<PodfileOptions> = (
       const versionEscaped = navigationSdkVersion.replace(/'/g, "\\\\'");
 
       const hook = `
-    ${PLUGIN_MARKER} SPM in Pods + search paths + BUILD_LIBRARY_FOR_DISTRIBUTION
+    ${PLUGIN_MARKER} SPM in Pods (deps only) + search paths + BUILD_LIBRARY_FOR_DISTRIBUTION
     mapbox_nav_version = '${versionEscaped}'
     installer.pods_project.targets.each do |target|
       if target.name.start_with?('Mapbox') || target.name == 'Turf'
@@ -80,11 +78,6 @@ export const withMapboxNavPodfile: ConfigPlugin<PodfileOptions> = (
         dep.package = pkg_ref
         dep.product_name = '${name}'
         emn_target.package_product_dependencies << dep
-        if emn_target.frameworks_build_phases
-          bf = project.new(Xcodeproj::Project::Object::PBXBuildFile)
-          bf.product_ref = dep
-          emn_target.frameworks_build_phases.files << bf
-        end
       end`
       ).join("")}
     end`;