@baeckerherz/expo-mapbox-navigation 0.1.27 → 0.1.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baeckerherz/expo-mapbox-navigation",
-  "version": "0.1.27",
+  "version": "0.1.28",
   "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

@@ -4,7 +4,6 @@ const config_plugins_1 = require("@expo/config-plugins");
 const withMapboxNavPodfile_1 = require("./withMapboxNavPodfile");
 const withMapboxNavGradle_1 = require("./withMapboxNavGradle");
 const withMapboxNavGradleProperties_1 = require("./withMapboxNavGradleProperties");
-const withMapboxArchiveFix_1 = require("./withMapboxArchiveFix");
 const withMapboxNavigation = (config, { mapboxAccessToken, mapboxSecretToken, navigationSdkVersion = "3.5.0", }) => {
     if (!mapboxAccessToken) {
         throw new Error("[@baeckerherz/expo-mapbox-navigation] mapboxAccessToken is required.");
@@ -25,12 +24,9 @@ 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.
+    // iOS: Adds Mapbox Navigation SPM to the Pods project, sets search paths,
+    // and adds a script phase to strip duplicate xcframework signatures.
     config = (0, withMapboxNavPodfile_1.withMapboxNavPodfile)(config, { navigationSdkVersion });
-    // iOS: Workaround for Xcode 17 bug — duplicate xcframework .signature files
-    // during archive creation. Strips them from BUILD_DIR before the archive step.
-    config = (0, withMapboxArchiveFix_1.withMapboxArchiveFix)(config);
     // Android: Mapbox Maven repository and optional token for SDK download
     config = (0, withMapboxNavGradle_1.withMapboxNavGradle)(config);
     config = (0, withMapboxNavGradleProperties_1.withMapboxNavGradleProperties)(config, { mapboxSecretToken });

package/plugin/build/withMapboxNavPodfile.js

@@ -95,6 +95,19 @@ const withMapboxNavPodfile = (config, { navigationSdkVersion }) => {
           emn_target.frameworks_build_phases.files << bf
         end
       end
+    end
+    # Xcode 17 bug: SPM binary xcframeworks sharing transitive deps cause
+    # duplicate .signature file copies during archive creation. Strip them.
+    user_proj = installer.aggregate_targets.first&.user_project
+    if user_proj
+      app_target = user_proj.targets.first
+      phase_name = 'StripXCFrameworkSignatures'
+      unless app_target.shell_script_build_phases.any? { |p| p.name == phase_name }
+        phase = app_target.new_shell_script_build_phase(phase_name)
+        d = '$'
+        phase.shell_script = "DERIVED_ROOT=\\"#{d}{BUILD_DIR%/Build/*}\\"\\nfind \\"#{d}{DERIVED_ROOT}\\" -name \\"*.xcframework-*.signature\\" -delete 2>/dev/null\\nexit 0\\n"
+      end
+      user_proj.save
     end`;
             const escapedMarker = PLUGIN_MARKER.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
             // Remove any previously injected hook (handles upgrades from older plugin versions)

package/plugin/src/index.ts

@@ -2,7 +2,6 @@ import { ConfigPlugin, createRunOncePlugin } from "@expo/config-plugins";
 import { withMapboxNavPodfile } from "./withMapboxNavPodfile";
 import { withMapboxNavGradle } from "./withMapboxNavGradle";
 import { withMapboxNavGradleProperties } from "./withMapboxNavGradleProperties";
-import { withMapboxArchiveFix } from "./withMapboxArchiveFix";
 
 interface PluginConfig {
   /** Mapbox public access token (pk.xxx). Required for the native SDK. */
@@ -44,14 +43,10 @@ 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.
+  // iOS: Adds Mapbox Navigation SPM to the Pods project, sets search paths,
+  // and adds a script phase to strip duplicate xcframework signatures.
   config = withMapboxNavPodfile(config, { navigationSdkVersion });
 
-  // iOS: Workaround for Xcode 17 bug — duplicate xcframework .signature files
-  // during archive creation. Strips them from BUILD_DIR before the archive step.
-  config = withMapboxArchiveFix(config);
-
   // Android: Mapbox Maven repository and optional token for SDK download
   config = withMapboxNavGradle(config);
   config = withMapboxNavGradleProperties(config, { mapboxSecretToken });

package/plugin/src/withMapboxNavPodfile.ts

@@ -74,6 +74,19 @@ export const withMapboxNavPodfile: ConfigPlugin<PodfileOptions> = (
           emn_target.frameworks_build_phases.files << bf
         end
       end
+    end
+    # Xcode 17 bug: SPM binary xcframeworks sharing transitive deps cause
+    # duplicate .signature file copies during archive creation. Strip them.
+    user_proj = installer.aggregate_targets.first&.user_project
+    if user_proj
+      app_target = user_proj.targets.first
+      phase_name = 'StripXCFrameworkSignatures'
+      unless app_target.shell_script_build_phases.any? { |p| p.name == phase_name }
+        phase = app_target.new_shell_script_build_phase(phase_name)
+        d = '$'
+        phase.shell_script = "DERIVED_ROOT=\\"#{d}{BUILD_DIR%/Build/*}\\"\\nfind \\"#{d}{DERIVED_ROOT}\\" -name \\"*.xcframework-*.signature\\" -delete 2>/dev/null\\nexit 0\\n"
+      end
+      user_proj.save
     end`;
 
       const escapedMarker = PLUGIN_MARKER.replace(