@dolami-inc/react-native-expo-unity 0.1.8 → 0.1.10

package/app.plugin.js

@@ -1,83 +1,78 @@
-// @ts-check
 const { withXcodeProject } = require('@expo/config-plugins');
+const path = require('path');
+const fs = require('fs');
 
 /**
- * Expo Config Plugin for react-native-expo-unity.
+ * Expo Config Plugin for @dolami-inc/react-native-expo-unity.
  *
- * Automatically injects the Xcode build settings required for
- * Unity as a Library (UaaL) to link and run correctly.
+ * - Injects required Xcode build settings (bitcode, C++17)
+ * - Adds a build phase that embeds UnityFramework.framework into the app
+ *   bundle at build time (device builds only)
  *
- * @param {import('@expo/config-plugins').ExpoConfig} config
+ * @param {object} config - Expo config
  * @param {{ unityPath?: string }} options
- *   unityPath — path to the Unity iOS build artifacts directory.
- *   Defaults to `$(PROJECT_DIR)/unity/builds/ios`.
+ *   unityPath — absolute path to the Unity iOS build artifacts directory.
+ *   Defaults to `<projectRoot>/unity/builds/ios`.
  *   Can also be set via the EXPO_UNITY_PATH environment variable.
  */
 const withExpoUnity = (config, options = {}) => {
   return withXcodeProject(config, (config) => {
     const xcodeProject = config.modResults;
+    const projectRoot = config.modRequest.projectRoot;
 
     const unityPath =
       options.unityPath ||
       process.env.EXPO_UNITY_PATH ||
-      '$(PROJECT_DIR)/unity/builds/ios';
+      path.join(projectRoot, 'unity', 'builds', 'ios');
 
+    // -- Build settings --
     const configurations = xcodeProject.pbxXCBuildConfigurationSection();
-
     for (const key of Object.keys(configurations)) {
       const configuration = configurations[key];
       if (typeof configuration !== 'object' || !configuration.buildSettings) {
         continue;
       }
-
       const settings = configuration.buildSettings;
-
-      // Unity as a Library does not support bitcode.
       settings['ENABLE_BITCODE'] = 'NO';
-
-      // Unity headers require C++17.
-      // Must be quoted — '+' causes CocoaPods' plist parser to fail if unquoted.
       settings['CLANG_CXX_LANGUAGE_STANDARD'] = '"c++17"';
+    }
+
+    // -- Embed UnityFramework via build script phase --
+    // UnityFramework is a dynamic framework that must be embedded (copied)
+    // into the app bundle's Frameworks/ directory, otherwise dyld fails at
+    // launch. We use a shell script build phase instead of vendored_frameworks
+    // because the pod source may live in a read-only package manager cache.
+    const frameworkSrc = path.join(unityPath, 'UnityFramework.framework');
+    if (fs.existsSync(frameworkSrc)) {
+      const target = xcodeProject.getFirstTarget();
 
-      // Add the Unity framework directory to the search paths so that
-      // UnityFramework.framework can be found at build time.
-      addFrameworkSearchPath(settings, unityPath);
+      // Shell script that copies and codesigns the framework (device only).
+      const script = [
+        'if [ "${PLATFORM_NAME}" = "iphoneos" ]; then',
+        '  FRAMEWORK_SRC="' + frameworkSrc + '"',
+        '  DEST="${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}"',
+        '  mkdir -p "${DEST}"',
+        '  rsync -av --delete "${FRAMEWORK_SRC}" "${DEST}/"',
+        '  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" ]; then',
+        '    codesign --force --sign "${EXPANDED_CODE_SIGN_IDENTITY}" "${DEST}/UnityFramework.framework"',
+        '  fi',
+        'fi',
+      ].join('\n');
+
+      xcodeProject.addBuildPhase(
+        [],
+        'PBXShellScriptBuildPhase',
+        'Embed UnityFramework',
+        target.uuid,
+        {
+          shellPath: '/bin/sh',
+          shellScript: script,
+        }
+      );
     }
 
     return config;
   });
 };
 
-/**
- * Appends `unityPath` to FRAMEWORK_SEARCH_PATHS without duplicating it.
- *
- * The xcode npm package stores this setting as either:
- *   - undefined (not set)
- *   - a plain string: `"$(inherited)"`
- *   - a parenthesised list: `("$(inherited)", "/some/path")`
- *
- * @param {Record<string, any>} settings
- * @param {string} unityPath
- */
-function addFrameworkSearchPath(settings, unityPath) {
-  const quoted = `"${unityPath}"`;
-  const existing = settings['FRAMEWORK_SEARCH_PATHS'];
-
-  if (!existing) {
-    settings['FRAMEWORK_SEARCH_PATHS'] = `(${quoted}, "$(inherited)")`;
-    return;
-  }
-
-  const asStr = String(existing);
-
-  // Already present — nothing to do.
-  if (asStr.includes(unityPath)) {
-    return;
-  }
-
-  // Strip surrounding parens if present, then rebuild.
-  const inner = asStr.replace(/^\(|\)$/g, '').trim();
-  settings['FRAMEWORK_SEARCH_PATHS'] = `(${quoted}, ${inner})`;
-}
-
 module.exports = withExpoUnity;

package/ios/ExpoUnity.podspec

@@ -34,9 +34,9 @@ Pod::Spec.new do |s|
   framework_exists = File.exist?(File.join(unity_ios_dir, 'UnityFramework.framework'))
   a_files          = Dir.glob(File.join(unity_ios_dir, '*.a'))
 
-  unity_ldflags  = []
-  unity_ldflags << '-framework UnityFramework' if framework_exists
-  unity_ldflags += a_files.map { |f| "\"#{f}\"" }
+  # Only static libs (.a) here — UnityFramework.framework linking + embedding
+  # is handled by the Expo config plugin (app.plugin.js) via addFramework.
+  unity_ldflags = a_files.map { |f| "\"#{f}\"" }
 
   # Unity framework is ARM-only (device build) — never link it for Simulator.
   # The [sdk=iphoneos*] conditional ensures these settings only apply when

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dolami-inc/react-native-expo-unity",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "Unity as a Library (UaaL) bridge for React Native / Expo",
   "main": "src/index.ts",
   "types": "src/index.ts",