fix androidtv

Author: ElenaDiachenko

package.json

@@ -127,9 +127,7 @@
     },
     "private": true,
     "resolutions": {
-        "@react-native-community/cli-platform-ios": "12.3.6",
-        "@react-native/gradle-plugin": "0.76.3",
-        "@react-native/codegen": "0.76.3"
+        "@react-native-community/cli-platform-ios": "12.3.6"
     },
     "title": "ReNative",
     "husky": {

packages/app-harness/package.json

@@ -61,7 +61,7 @@
         "react-native-photo-editor": "github:AppGyver/react-native-photo-editor#0.1.2",
         "react-native-safe-area-context": "5.0.0",
         "react-native-splash-screen": "3.3.0",
-        "react-native-tvos": "0.73.6-0",
+        "react-native-tvos": "0.76.3-0",
         "react-native-web": "0.19.12",
         "rn-fetch-blob": "0.12.0"
     },

packages/config-templates/pluginTemplates/react-native-tvos/overrides.json renamed to packages/config-templates/pluginTemplates/react-native-tvos/[email protected]

@@ -3358,7 +3358,7 @@
             }
         },
         "react-native-tvos": {
-            "version": "0.73.6-0",
+            "version": "0.76.3-0",
             "supportedPlatforms": ["tvos", "firetv", "androidtv"]
         },
         "react-native-tvos-controller": {

packages/config-templates/renative.templates.json

@@ -1,4 +1,4 @@
-import { Env } from '@rnv/core';
+import { Env, fsExistsSync } from '@rnv/core';
 import { withMetroConfig, mergeConfig, InputConfig } from '@rnv/sdk-react-native';
 
 const path = require('path');
@@ -34,8 +34,8 @@ export const withRNVMetro = (config: InputConfig) => {
     const projectPath = env.RNV_PROJECT_ROOT || process.cwd();
 
     const defaultConfig = withMetroConfig(projectPath);
-
-    const watchFolders = [path.resolve(projectPath, 'node_modules')];
+    const projectNodeModulesPath = path.resolve(projectPath, 'node_modules');
+    const watchFolders = fsExistsSync(projectNodeModulesPath) ? [projectNodeModulesPath] : [];
 
     const metroCache = require(require.resolve('metro-cache', { paths: [projectPath] }));
 

packages/engine-rn-tvos/src/adapters/metroAdapter.ts

@@ -52,6 +52,9 @@ react {
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]
+
+    /* Autolinking */
+    autolinkLibrariesWithApp()
 }
 
 /**
@@ -126,6 +129,4 @@ dependencies {
     } else {
         implementation jscFlavor
     }
-}
-
-apply from: file("{{PATH_REACT_NATIVE_CLI_ANDROID}}/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+}

packages/engine-rn-tvos/templates/platforms/androidtv/app/build.gradle

@@ -9,6 +9,7 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
+import com.facebook.react.soloader.OpenSourceMergedSoMapping
 import com.facebook.soloader.SoLoader
 
 {{PLUGIN_IMPORTS}}
@@ -35,11 +36,11 @@ class MainApplication : Application(), ReactApplication {
   {{PLUGIN_METHODS}}
 
   override val reactHost: ReactHost
-    get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
+     get() = getDefaultReactHost(applicationContext, reactNativeHost)
 
   override fun onCreate() {
     super.onCreate()
-    SoLoader.init(this, false)
+    SoLoader.init(this, OpenSourceMergedSoMapping)
     if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
       // If you opted-in for the New Architecture, we load the native entry point for this app.
       load()

packages/engine-rn-tvos/templates/platforms/androidtv/app/src/main/java/rnv_template/MainApplication.kt

@@ -1,3 +1,6 @@
+pluginManagement { includeBuild('{{RN_GRADLE_PLUGIN_LOCATION}}') }
+plugins { id("com.facebook.react.settings") }
+extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
 rootProject.name = '{{RN_GRADLE_PROJECT_NAME}}'
 apply from: file("{{RN_CLI_LOCATION}}/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'

packages/engine-rn-tvos/templates/platforms/androidtv/settings.gradle

@@ -37,7 +37,7 @@
         "@rnv/adapter": "1.7.0-rc.0",
         "@rnv/sdk-react-native": "1.7.0-rc.0",
         "@xmldom/xmldom": "0.7.7",
-        "react-native-windows": "0.72.10",
+        "react-native-windows": "0.76.2",
         "rimraf": "2.6.2",
         "typescript": "5.2.2"
     },

packages/engine-rn-windows/package.json

@@ -88,7 +88,5 @@ export const withRNVMetro = (config: InputConfig): InputConfig => {
     };
 
     const cnf = mergeConfig(defaultConfig, config, cnfRnv);
-    console.log('metro cnf !!!!!!!!!', cnf);
-
     return cnf;
 };