@dolami-inc/react-native-expo-unity 0.3.3 → 0.4.0

package/android/src/main/java/expo/modules/unity/ExpoUnityView.kt

@@ -5,6 +5,7 @@ import android.util.Log
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
 
 class ExpoUnityView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {

package/android/src/main/java/expo/modules/unity/UnityBridge.kt

@@ -8,6 +8,7 @@ import android.view.View
 import com.expounity.bridge.NativeCallProxy
 import com.unity3d.player.IUnityPlayerLifecycleEvents
 import com.unity3d.player.UnityPlayer
+import com.unity3d.player.UnityPlayerForActivityOrService
 
 /**
  * Singleton managing the UnityPlayer lifecycle.
@@ -43,17 +44,18 @@ class UnityBridge private constructor() : IUnityPlayerLifecycleEvents, NativeCal
         get() = unityPlayer != null
 
     /**
-     * Returns the UnityPlayer view for embedding. UnityPlayer extends FrameLayout.
+     * Returns the UnityPlayer view for embedding.
+     * Unity 6+ made UnityPlayer abstract; use getView() to get the renderable view.
      */
     val unityPlayerView: View?
-        get() = unityPlayer
+        get() = unityPlayer?.view
 
     fun initialize(activity: Activity) {
         if (isInitialized) return
 
         val runInit = Runnable {
             try {
-                val player = UnityPlayer(activity, this)
+                val player = UnityPlayerForActivityOrService(activity, this)
                 unityPlayer = player
 
                 NativeCallProxy.registerListener(this)

package/app.plugin.js

@@ -3,10 +3,32 @@ const {
   withSettingsGradle,
   withProjectBuildGradle,
   withAppBuildGradle,
+  withGradleProperties,
 } = require('@expo/config-plugins');
 const path = require('path');
 const fs = require('fs');
 
+/**
+ * Parse a Java .properties file into an array of { type, key, value } entries.
+ */
+function parsePropertiesFile(filePath) {
+  if (!fs.existsSync(filePath)) return [];
+  const lines = fs.readFileSync(filePath, 'utf8').split('\n');
+  const entries = [];
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith('#') || trimmed.startsWith('!')) continue;
+    const eqIndex = trimmed.indexOf('=');
+    if (eqIndex === -1) continue;
+    entries.push({
+      type: 'property',
+      key: trimmed.slice(0, eqIndex).trim(),
+      value: trimmed.slice(eqIndex + 1).trim(),
+    });
+  }
+  return entries;
+}
+
 /**
  * Expo Config Plugin for @dolami-inc/react-native-expo-unity.
  *
@@ -17,6 +39,7 @@ const fs = require('fs');
  *
  * Android:
  * - Includes the :unityLibrary Gradle module and .androidlib subprojects in settings.gradle
+ * - Copies Unity gradle properties (unity.*, unityStreamingAssets) to host gradle.properties
  * - Adds flatDir repos for Unity's .aar/.jar libs in root build.gradle
  * - Adds the unityLibrary dependency and NDK abiFilters in app/build.gradle
  *
@@ -121,6 +144,40 @@ const withExpoUnity = (config, options = {}) => {
     return config;
   });
 
+  // -- Android: gradle.properties (copy Unity properties to host project) --
+  // Unity's build.gradle references properties like `unityStreamingAssets` and
+  // `unity.*` that are defined in the Unity export's gradle.properties. When the
+  // unityLibrary is included as a subproject, it inherits the host's properties,
+  // so we need to copy the required ones over.
+  config = withGradleProperties(config, (config) => {
+    const projectRoot = config.modRequest.projectRoot;
+    const androidUnityPath =
+      options.androidUnityPath ||
+      process.env.EXPO_UNITY_ANDROID_PATH ||
+      path.join(projectRoot, 'unity', 'builds', 'android');
+
+    const unityPropsPath = path.join(androidUnityPath, 'gradle.properties');
+    const unityProps = parsePropertiesFile(unityPropsPath);
+
+    // Only copy unity-specific properties (unity.* and unityStreamingAssets)
+    const existingKeys = new Set(
+      config.modResults
+        .filter((p) => p.type === 'property')
+        .map((p) => p.key)
+    );
+
+    for (const prop of unityProps) {
+      if (
+        (prop.key.startsWith('unity.') || prop.key === 'unityStreamingAssets' || prop.key === 'unityTemplateVersion') &&
+        !existingKeys.has(prop.key)
+      ) {
+        config.modResults.push(prop);
+      }
+    }
+
+    return config;
+  });
+
   // -- Android: build.gradle (flatDir repos for Unity's native libs) --
   // This must go in the root build.gradle (not settings.gradle) because
   // `allprojects` is not a valid method in settings.gradle on Gradle 8+.

package/package.json

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