@nx/react-native 0.0.0-pr-31222-862e973 → 0.0.0-pr-31313-387cdca

package/plugins/metro-resolver.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getResolveRequest = getResolveRequest;
 const metroResolver = require("metro-resolver");
 const tsconfig_paths_1 = require("tsconfig-paths");
-const chalk = require("chalk");
+const pc = require("picocolors");
 const enhanced_resolve_1 = require("enhanced-resolve");
 const path_1 = require("path");
 const fs = require("fs");
@@ -26,9 +26,9 @@ function getResolveRequest(extensions, exportsConditionNames = [], mainFields =
             return resolvedPath;
         }
         if (debug) {
-            console.log(chalk.red(`[Nx] Unable to resolve with any resolver: ${realModuleName}`));
+            console.log(pc.red(`[Nx] Unable to resolve with any resolver: ${realModuleName}`));
         }
-        throw new Error(`Cannot resolve ${chalk.bold(realModuleName)}`);
+        throw new Error(`Cannot resolve ${pc.bold(realModuleName)}`);
     };
 }
 function resolveRequestFromContext(resolveRequest, context, realModuleName, platform, debug) {
@@ -37,7 +37,7 @@ function resolveRequestFromContext(resolveRequest, context, realModuleName, plat
     }
     catch {
         if (debug)
-            console.log(chalk.cyan(`[Nx] Unable to resolve with default resolveRequest: ${realModuleName}`));
+            console.log(pc.cyan(`[Nx] Unable to resolve with default resolveRequest: ${realModuleName}`));
     }
 }
 /**
@@ -50,7 +50,7 @@ function defaultMetroResolver(context, realModuleName, platform, debug) {
     }
     catch {
         if (debug)
-            console.log(chalk.cyan(`[Nx] Unable to resolve with default Metro resolver: ${realModuleName}`));
+            console.log(pc.cyan(`[Nx] Unable to resolve with default Metro resolver: ${realModuleName}`));
     }
 }
 /**
@@ -69,7 +69,7 @@ function pnpmResolver(extensions, context, realModuleName, debug, exportsConditi
     }
     catch {
         if (debug)
-            console.log(chalk.cyan(`[Nx] Unable to resolve with default PNPM resolver: ${realModuleName}`));
+            console.log(pc.cyan(`[Nx] Unable to resolve with default PNPM resolver: ${realModuleName}`));
     }
 }
 /**
@@ -84,8 +84,8 @@ function tsconfigPathsResolver(context, extensions, realModuleName, platform, de
     }
     catch {
         if (debug) {
-            console.log(chalk.cyan(`[Nx] Failed to resolve ${chalk.bold(realModuleName)}`));
-            console.log(chalk.cyan(`[Nx] The following tsconfig paths was used:\n:${chalk.bold(JSON.stringify(paths, null, 2))}`));
+            console.log(pc.cyan(`[Nx] Failed to resolve ${pc.bold(realModuleName)}`));
+            console.log(pc.cyan(`[Nx] The following tsconfig paths was used:\n:${pc.bold(JSON.stringify(paths, null, 2))}`));
         }
     }
 }
@@ -99,13 +99,13 @@ function getMatcher(debug) {
             absoluteBaseUrl = result.absoluteBaseUrl;
             paths = result.paths;
             if (debug) {
-                console.log(chalk.cyan(`[Nx] Located tsconfig at ${chalk.bold(absoluteBaseUrl)}`));
-                console.log(chalk.cyan(`[Nx] Found the following paths:\n:${chalk.bold(JSON.stringify(paths, null, 2))}`));
+                console.log(pc.cyan(`[Nx] Located tsconfig at ${pc.bold(absoluteBaseUrl)}`));
+                console.log(pc.cyan(`[Nx] Found the following paths:\n:${pc.bold(JSON.stringify(paths, null, 2))}`));
             }
             matcher = (0, tsconfig_paths_1.createMatchPath)(absoluteBaseUrl, paths);
         }
         else {
-            console.log(chalk.cyan(`[Nx] Failed to locate tsconfig}`));
+            console.log(pc.cyan(`[Nx] Failed to locate tsconfig}`));
             throw new Error(`Could not load tsconfig for project`);
         }
     }

package/plugins/plugin.d.ts

@@ -1,4 +1,4 @@
-import { CreateDependencies, CreateNodes } from '@nx/devkit';
+import { CreateNodes, CreateNodesV2 } from '@nx/devkit';
 export interface ReactNativePluginOptions {
     startTargetName?: string;
     podInstallTargetName?: string;
@@ -10,5 +10,5 @@ export interface ReactNativePluginOptions {
     syncDepsTargetName?: string;
     upgradeTargetName?: string;
 }
-export declare const createDependencies: CreateDependencies;
+export declare const createNodesV2: CreateNodesV2<ReactNativePluginOptions>;
 export declare const createNodes: CreateNodes<ReactNativePluginOptions>;

package/plugins/plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = exports.createDependencies = void 0;
+exports.createNodes = exports.createNodesV2 = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const js_1 = require("@nx/js");
@@ -9,54 +9,75 @@ const fs_1 = require("fs");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
-const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'react-native.hash');
-const targetsCache = readTargetsCache();
-function readTargetsCache() {
+const devkit_internals_1 = require("nx/src/devkit-internals");
+function readTargetsCache(cachePath) {
     return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
 }
-function writeTargetsToCache() {
-    const oldCache = readTargetsCache();
+function writeTargetsToCache(cachePath, targetsCache) {
+    const oldCache = readTargetsCache(cachePath);
     (0, devkit_1.writeJsonFile)(cachePath, {
         ...oldCache,
-        ...targetsCache,
+        targetsCache,
     });
 }
-const createDependencies = () => {
-    writeTargetsToCache();
-    return [];
-};
-exports.createDependencies = createDependencies;
-exports.createNodes = [
-    '**/app.{json,config.js}',
-    async (configFilePath, options, context) => {
-        options = normalizeOptions(options);
-        const projectRoot = (0, path_1.dirname)(configFilePath);
-        // Do not create a project if package.json or project.json or metro.config.js isn't there.
-        const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
-        if (!siblingFiles.includes('package.json') ||
-            !siblingFiles.includes('metro.config.js')) {
-            return {};
+exports.createNodesV2 = [
+    '**/app.{json,config.js,config.ts}',
+    async (configFiles, options, context) => {
+        const optionsHash = (0, devkit_internals_1.hashObject)(options);
+        const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `react-native-${optionsHash}.hash`);
+        const targetsCache = readTargetsCache(cachePath);
+        try {
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache), configFiles, options, context);
         }
-        const appConfig = await getAppConfig(configFilePath, context);
-        if (appConfig.expo) {
-            return {};
+        finally {
+            writeTargetsToCache(cachePath, targetsCache);
         }
-        const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
-        targetsCache[hash] ??= buildReactNativeTargets(projectRoot, options, context);
-        return {
-            projects: {
-                [projectRoot]: {
-                    targets: targetsCache[hash],
-                },
-            },
-        };
     },
 ];
+exports.createNodes = [
+    '**/app.{json,config.js,config.ts}',
+    async (configFilePath, options, context) => {
+        const optionsHash = (0, devkit_internals_1.hashObject)(options);
+        const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `react-native-${optionsHash}.hash`);
+        const targetsCache = readTargetsCache(cachePath);
+        const result = await createNodesInternal(configFilePath, options, context, targetsCache);
+        writeTargetsToCache(cachePath, targetsCache);
+        return result;
+    },
+];
+async function createNodesInternal(configFile, options, context, targetsCache) {
+    options = normalizeOptions(options);
+    const projectRoot = (0, path_1.dirname)(configFile);
+    // Do not create a project if package.json or project.json or metro.config.js isn't there.
+    const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
+    if (!siblingFiles.includes('package.json') ||
+        !siblingFiles.includes('metro.config.js')) {
+        return {};
+    }
+    // Check if it's an Expo project
+    const packageJson = (0, devkit_1.readJsonFile)((0, path_1.join)(context.workspaceRoot, projectRoot, 'package.json'));
+    const appConfig = await getAppConfig(configFile, context);
+    if (appConfig.expo ||
+        packageJson.dependencies?.['expo'] ||
+        packageJson.devDependencies?.['expo']) {
+        return {};
+    }
+    const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
+    targetsCache[hash] ??= buildReactNativeTargets(projectRoot, options, context);
+    return {
+        projects: {
+            [projectRoot]: {
+                targets: targetsCache[hash],
+            },
+        },
+    };
+}
 function buildReactNativeTargets(projectRoot, options, context) {
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {
         [options.startTargetName]: {
             command: `react-native start`,
+            continuous: true,
             options: { cwd: projectRoot },
         },
         [options.podInstallTargetName]: {
@@ -66,10 +87,12 @@ function buildReactNativeTargets(projectRoot, options, context) {
         },
         [options.runIosTargetName]: {
             command: `react-native run-ios`,
+            continuous: true,
             options: { cwd: projectRoot },
         },
         [options.runAndroidTargetName]: {
             command: `react-native run-android`,
+            continuous: true,
             options: { cwd: projectRoot },
         },
         [options.buildIosTargetName]: {

package/project.json

@@ -39,14 +39,8 @@
       }
     },
     "build": {
-      "executor": "nx:run-commands",
-      "outputs": ["{workspaceRoot}/build/packages/react-native"],
-      "options": {
-        "command": "node ./scripts/copy-readme.js react-native"
-      }
-    },
-    "add-extra-dependencies": {
-      "command": "node ./scripts/add-dependency-to-build.js react-native @nrwl/react-native"
+      "outputs": ["{workspaceRoot}/build/packages/react-native/README.md"],
+      "command": "node ./scripts/copy-readme.js react-native"
     }
   }
 }

package/src/executors/run-android/schema.json

@@ -1,5 +1,6 @@
 {
   "version": 2,
+  "continuous": true,
   "outputCapture": "direct-nodejs",
   "cli": "nx",
   "$id": "NxReactNativeRunAndroid",

package/src/executors/run-ios/schema.json

@@ -1,5 +1,6 @@
 {
   "version": 2,
+  "continuous": true,
   "outputCapture": "direct-nodejs",
   "cli": "nx",
   "$id": "NxReactNativeRunIos",

package/src/executors/start/lib/is-packager-running.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isPackagerRunning = isPackagerRunning;
-const node_fetch_1 = require("node-fetch");
 async function isPackagerRunning(packagerPort) {
     try {
-        const resp = await (0, node_fetch_1.default)(`http://localhost:${packagerPort}/status`);
+        const resp = await fetch(`http://localhost:${packagerPort}/status`);
         const data = await resp.text();
         return data === 'packager-status:running' ? 'running' : 'unrecognized';
     }

package/src/executors/start/schema.json

@@ -1,5 +1,6 @@
 {
   "version": 2,
+  "continuous": true,
   "outputCapture": "direct-nodejs",
   "cli": "nx",
   "$id": "NxReactNativeStart",

package/src/executors/storybook/storybook.impl.js

@@ -6,7 +6,7 @@ const node_fs_1 = require("node:fs");
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 const fileutils_1 = require("@nx/workspace/src/utilities/fileutils");
-const chalk = require("chalk");
+const pc = require("picocolors");
 const glob_1 = require("glob");
 const sync_deps_impl_1 = require("../sync-deps/sync-deps.impl");
 /**
@@ -16,7 +16,7 @@ const sync_deps_impl_1 = require("../sync-deps/sync-deps.impl");
 async function* reactNativeStorybookExecutor(options, context) {
     const { syncDeps: isSyncDepsEnabled = true } = options;
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-    devkit_1.logger.info(`${chalk.bold.cyan('info')} To see your Storybook stories on the device, you should start your mobile app for the <platform> of your choice (typically ios or android).`);
+    devkit_1.logger.info(`${pc.bold(pc.cyan('info'))} To see your Storybook stories on the device, you should start your mobile app for the <platform> of your choice (typically ios or android).`);
     // add storybook addons to app's package.json
     const packageJsonPath = (0, path_1.join)(context.root, projectRoot, 'package.json');
     const workspacePackageJsonPath = (0, path_1.join)(context.root, 'package.json');
@@ -44,7 +44,7 @@ function runCliStorybook(workspaceRoot, options) {
         });
     });
     if (storiesFiles.length === 0) {
-        devkit_1.logger.warn(`${chalk.bold.yellow('warn')} No stories found.`);
+        devkit_1.logger.warn(`${pc.bold(pc.yellow('warn'))} No stories found.`);
     }
     const newContents = `// Auto-generated file created by nx
 // DO NOT EDIT.

package/src/executors/sync-deps/sync-deps.impl.js

@@ -4,7 +4,7 @@ exports.default = syncDepsExecutor;
 exports.syncDeps = syncDeps;
 exports.displayNewlyAddedDepsMessage = displayNewlyAddedDepsMessage;
 const path_1 = require("path");
-const chalk = require("chalk");
+const pc = require("picocolors");
 const devkit_1 = require("@nx/devkit");
 const find_all_npm_dependencies_1 = require("../../utils/find-all-npm-dependencies");
 async function* syncDepsExecutor(options, context) {
@@ -68,10 +68,10 @@ async function syncDeps(projectName, projectPackageJson, projectPackageJsonPath,
 }
 function displayNewlyAddedDepsMessage(projectName, deps) {
     if (deps.length > 0) {
-        devkit_1.logger.info(`${chalk.bold.cyan('info')} Added entries to 'package.json' for '${projectName}' (for autolink):
-  ${deps.map((d) => chalk.bold.cyan(`"${d}": "*"`)).join('\n  ')}`);
+        devkit_1.logger.info(`${pc.bold(pc.cyan('info'))} Added entries to 'package.json' for '${projectName}' (for autolink):
+  ${deps.map((d) => pc.bold(pc.cyan(`"${d}": "*"`))).join('\n  ')}`);
     }
     else {
-        devkit_1.logger.info(`${chalk.bold.cyan('info')} Dependencies for '${projectName}' are up to date! No changes made.`);
+        devkit_1.logger.info(`${pc.bold(pc.cyan('info'))} Dependencies for '${projectName}' are up to date! No changes made.`);
     }
 }

package/src/generators/application/application.js

@@ -17,21 +17,26 @@ const create_application_files_1 = require("./lib/create-application-files");
 const add_e2e_1 = require("./lib/add-e2e");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 const sync_deps_impl_1 = require("../../executors/sync-deps/sync-deps.impl");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function reactNativeApplicationGenerator(host, schema) {
     return await reactNativeApplicationGeneratorInternal(host, {
         addPlugin: false,
-        projectNameAndRootFormat: 'derived',
+        useProjectJson: true,
         ...schema,
     });
 }
 async function reactNativeApplicationGeneratorInternal(host, schema) {
-    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     const tasks = [];
     const jsInitTask = await (0, js_1.initGenerator)(host, {
         ...schema,
         skipFormat: true,
+        addTsPlugin: schema.useTsSolution,
+        formatter: schema.formatter,
+        platform: 'web',
     });
     tasks.push(jsInitTask);
+    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
     tasks.push(initTask);
     if (!options.skipPackageJson) {
@@ -39,6 +44,11 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
     }
     await (0, create_application_files_1.createApplicationFiles)(host, options);
     (0, add_project_1.addProject)(host, options);
+    // If we are using the new TS solution
+    // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
+    if (options.isTsSolutionSetup) {
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
+    }
     const lintTask = await (0, add_linting_1.addLinting)(host, {
         ...options,
         projectRoot: options.appProjectRoot,
@@ -47,11 +57,11 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
         ],
     });
     tasks.push(lintTask);
-    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.appProjectRoot, options.js, options.skipPackageJson, options.addPlugin);
+    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.appProjectRoot, options.js, options.skipPackageJson, options.addPlugin, 'tsconfig.app.json');
     tasks.push(jestTask);
     const webTask = await (0, web_configuration_1.webConfigurationGenerator)(host, {
         ...options,
-        project: options.name,
+        project: options.projectName,
         skipFormat: true,
     });
     tasks.push(webTask);
@@ -75,6 +85,16 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
             ],
         });
     }
+    (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.appProjectRoot, 'tsconfig.app.json', {
+        jsx: 'react-jsx',
+        module: 'esnext',
+        moduleResolution: 'bundler',
+        noUnusedLocals: false,
+        lib: ['dom'],
+    }, options.linter === 'eslint'
+        ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
+        : undefined);
+    (0, sort_fields_1.sortPackageJsonFields)(host, options.appProjectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/src/generators/application/files/app/.babelrc.js.template

@@ -3,7 +3,7 @@ module.exports = function (api) {
 
   if (
     process.env.NX_TASK_TARGET_TARGET === 'build' ||
-    process.env.NX_TASK_TARGET_TARGET.includes('storybook')
+    process.env.NX_TASK_TARGET_TARGET?.includes('storybook')
   ) {
     return {
       presets: [

package/src/generators/application/files/app/Gemfile.template

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
-# bound in the template on Cocoapods with next React Native release.
-gem 'cocoapods', '>= 1.13', '< 1.15'
-gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
+# Exclude problematic versions of cocoapods and activesupport that causes build failures.
+gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
+gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
+gem 'xcodeproj', '< 1.26.0'

package/src/generators/application/files/app/android/app/build.gradle.template

@@ -8,13 +8,13 @@ apply plugin: "com.facebook.react"
  */
 react {
     /* Folders */
-    //   The root of your project, i.e. where "package.json" lives. Default is '..'
-    // root = file("../")
-    //   The folder where the react-native NPM package is. Default is <%= offsetFromRoot %>../../node_modules/react-native
+    //   The root of your project, i.e. where "package.json" lives. Default is '../..'
+    // root = file("../../")
+    //   The folder where the react-native NPM package is. Default is ../../node_modules/react-native
     reactNativeDir = file("<%= offsetFromRoot %>../../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is <%= offsetFromRoot %>../../node_modules/@react-native/codegen
+    //   The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
     codegenDir = file("<%= offsetFromRoot %>../../node_modules/@react-native/codegen")
-    //   The cli.js file which is the React Native CLI entrypoint. Default is <%= offsetFromRoot %>../../node_modules/react-native/cli.js
+    //   The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
     cliFile = file("<%= offsetFromRoot %>../../node_modules/react-native/cli.js")
 
     /* Variants */
@@ -45,10 +45,13 @@ react {
 
     /* Hermes Commands */
     //   The hermes compiler command to run. By default it is 'hermesc'
-    hermesCommand = "<%= offsetFromRoot %>node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc"
+    hermesCommand = "<%= offsetFromRoot %>../../node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc"
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]
+
+    /* Autolinking */
+    autolinkLibrariesWithApp()
 }
 
 /**
@@ -114,5 +117,3 @@ dependencies {
         implementation jscFlavor
     }
 }
-
-apply from: file("<%= offsetFromRoot %>../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

package/src/generators/application/files/app/android/app/src/main/AndroidManifest.xml.template

@@ -9,6 +9,7 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
       android:theme="@style/AppTheme"
+      android:supportsRtl="true"
       android:networkSecurityConfig="@xml/network_security_config">
       <activity
         android:name=".MainActivity"

package/src/generators/application/files/app/android/app/src/main/java/com/__lowerCaseName__/MainApplication.kt.template

@@ -9,17 +9,18 @@ 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
 
 class MainApplication : Application(), ReactApplication {
 
   override val reactNativeHost: ReactNativeHost =
       object : DefaultReactNativeHost(this) {
-        override fun getPackages(): List<ReactPackage> {
-          // Packages that cannot be autolinked yet can be added manually here, for example:
-          // packages.add(new MyReactNativePackage());
-          return PackageList(this).packages
-        }
+        override fun getPackages(): List<ReactPackage> =
+            PackageList(this).packages.apply {
+              // Packages that cannot be autolinked yet can be added manually here, for example:
+              // add(MyReactNativePackage())
+            }
 
         override fun getJSMainModuleName(): String = "src/main"
 
@@ -34,7 +35,7 @@ class MainApplication : Application(), ReactApplication {
 
   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()

package/src/generators/application/files/app/android/build.gradle.template

@@ -1,11 +1,11 @@
 buildscript {
     ext {
-        buildToolsVersion = "34.0.0"
-        minSdkVersion = 23
-        compileSdkVersion = 34
+        buildToolsVersion = "35.0.0"
+        minSdkVersion = 24
+        compileSdkVersion = 35
         targetSdkVersion = 34
         ndkVersion = "26.1.10909125"
-        kotlinVersion = "1.9.22"
+        kotlinVersion = "1.9.24"
     }
     repositories {
         google()

package/src/generators/application/files/app/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

package/src/generators/application/files/app/android/gradle.properties

@@ -21,8 +21,6 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
 
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using
@@ -34,7 +32,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 # your application. You should enable this flag either if you want
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
-newArchEnabled=false
+newArchEnabled=true
 
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.