Upgrade development app and example app to RN 0.79.7 and enable new architecture

.gitignore

@@ -80,6 +80,8 @@ yarn-error.log
 
 packages/core/example/*
 development-app/.env
-development-app/vendor/
 example-app/.env
-example-epp/vendor/
+.cursor/
+.vscode/
+**/.kotlin/
+**/vendor/

CollaboratorNote.md

@@ -48,12 +48,28 @@
 
 ## How to Release
 
-1. **Publish to npm:**
+**Prerequisite:** Two-factor authentication (2FA) or a granular access token with **bypass 2FA** enabled is required to publish packages. Use your npm token as follows.
+
+1. **Configure your npm token** (choose one):
+   - **Option A – Environment variable (CI or local):**  
+     Create or edit `mono/.npmrc` (do not commit the token). Add:
+     ```ini
+     //registry.npmjs.org/:_authToken=${NPM_TOKEN}
+     ```
+     Then run:
+     ```sh
+     export NPM_TOKEN=your_npm_token_here
+     cd mono && npx lerna publish
+     ```
+   - **Option B – Log in once:**  
+     From `mono/` run `npm login` and follow the prompts. Then run `npx lerna publish` as needed.
+
+2. **Publish to npm:**
    - From the monorepo root, run:
      ```sh
-     npx lerna publish
+     cd mono && npx lerna publish
      ```
-2. **Select the version:**
+3. **Select the version:**
 
 
 ---

development-app/Gemfile

@@ -3,7 +3,14 @@ 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'
+gem 'concurrent-ruby', '< 1.3.4'
+
+# Ruby 3.4.0 has removed some libraries from the standard library.
+gem 'bigdecimal'
+gem 'logger'
+gem 'benchmark'
+gem 'mutex_m'

development-app/Gemfile.lock

@@ -17,6 +17,8 @@ GEM
       json (>= 1.5.1)
     atomos (0.1.3)
     base64 (0.2.0)
+    benchmark (0.2.0)
+    bigdecimal (3.1.1)
     claide (1.1.0)
     cocoapods (1.14.3)
       addressable (~> 2.8)
@@ -68,8 +70,10 @@ GEM
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     json (2.7.2)
+    logger (1.5.0)
     minitest (5.24.1)
     molinillo (0.8.0)
+    mutex_m (0.1.1)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
@@ -95,8 +99,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 6.1.7.5, < 7.1.0)
-  cocoapods (>= 1.13, < 1.15)
+  activesupport (>= 6.1.7.5, != 7.1.0)
+  benchmark
+  bigdecimal
+  cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
+  concurrent-ruby (< 1.3.4)
+  logger
+  mutex_m
+  xcodeproj (< 1.26.0)
 
 RUBY VERSION
    ruby 2.7.4p191

development-app/android/app/build.gradle

@@ -9,14 +9,14 @@ apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.grad
  */
 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 ../node_modules/react-native
-    // reactNativeDir = file("../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
-    // codegenDir = file("../node_modules/@react-native/codegen")
-    //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
-    // cliFile = file("../node_modules/react-native/cli.js")
+    //   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("../../node_modules/react-native")
+    //   The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
+    // codegenDir = file("../../node_modules/@react-native/codegen")
+    //   The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
+    // cliFile = file("../../node_modules/react-native/cli.js")
 
     /* Variants */
     //   The list of variants to that are debuggable. For those we're going to
@@ -50,6 +50,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()
 }
 
 /**
@@ -61,14 +64,14 @@ def enableProguardInReleaseBuilds = false
  * The preferred build flavor of JavaScriptCore (JSC)
  *
  * For example, to use the international variant, you can use:
- * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
+ * `def jscFlavor = io.github.react-native-community:jsc-android-intl:2026004.+`
  *
  * The international variant includes ICU i18n library and necessary data
  * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
  * give correct results when using with locales other than en-US. Note that
  * this variant is about 6MiB larger per architecture than default.
  */
-def jscFlavor = 'org.webkit:android-jsc:+'
+def jscFlavor = 'io.github.react-native-community:jsc-android:2026004.+'
 
 android {
     ndkVersion rootProject.ext.ndkVersion
@@ -160,5 +163,3 @@ dependencies {
     implementation('com.radiusnetworks.flybuy:live-status')
 
 }
-
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

development-app/android/app/src/main/AndroidManifest.xml

@@ -37,6 +37,7 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
       android:theme="@style/AppTheme"
+      android:supportsRtl="true"
       android:dataExtractionRules="@xml/data_extraction_rules"
       android:fullBackupContent="@xml/backup_rules"
       tools:replace="android:dataExtractionRules,android:fullBackupContent">

development-app/android/app/src/main/java/com/example/MainApplication.kt

@@ -6,7 +6,8 @@ import com.facebook.react.ReactApplication
 import com.facebook.react.ReactHost
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint
+import com.facebook.react.soloader.OpenSourceMergedSoMapping
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
 import com.facebook.soloader.SoLoader
@@ -42,10 +43,16 @@ class MainApplication : Application(), ReactApplication {
 
   override fun onCreate() {
     super.onCreate()
-    SoLoader.init(this, false)
+    // Use standard SoLoader init (matches ReactInstanceManager) so feature flags and TurboModules
+    // load in the correct order. OpenSourceMergedSoMapping can cause bridgeless to stay true.
+    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()
+      // New Architecture with bridgeless mode (TurboModules + Fabric + Bridgeless).
+      DefaultNewArchitectureEntryPoint.load(
+        turboModulesEnabled = true,
+        fabricEnabled = true,
+        bridgelessEnabled = false
+      )
     }
 
     // Native configure

development-app/android/build.gradle

@@ -1,11 +1,11 @@
 buildscript {
     ext {
-        buildToolsVersion = "34.0.0"
-        minSdkVersion = 26
+        buildToolsVersion = "35.0.0"
+        minSdkVersion = 24
         compileSdkVersion = 35
         targetSdkVersion = 35
-        ndkVersion = "26.1.10909125"
-        kotlinVersion = "1.9.22"
+        ndkVersion = "27.1.12297006"
+        kotlinVersion = "2.0.21"
         flybuyVersion = "2.15.2" // Modify this to update the version
     }
     repositories {

development-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.

development-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.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

development-app/android/settings.gradle

@@ -1,4 +1,6 @@
+pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
+plugins { id("com.facebook.react.settings") }
+extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
 rootProject.name = 'example'
-apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')

development-app/ios/Podfile

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 # Resolve react_native_pods.rb with node to allow for hoisting
 def node_require(script)
   # Resolve script with node to allow for hoisting
@@ -16,10 +18,12 @@ prepare_react_native_project!
 
 setup_permissions([
   'LocationWhenInUse',
-  'Notifications'
+  'Notifications',
+  'LocationAlways',
 ])
 
-ENV['RCT_NEW_ARCH_ENABLED'] = '0'
+# Enable New Architecture
+ENV['RCT_NEW_ARCH_ENABLED'] = '1'
 linkage = ENV['USE_FRAMEWORKS']
 if linkage != nil
   Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
@@ -35,11 +39,6 @@ target 'development-app' do
     :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
 
-  target 'development-appTests' do
-    inherit! :complete
-    # Pods for testing
-  end
-
   post_install do |installer|
     # https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202
     react_native_post_install(
@@ -48,5 +47,20 @@ target 'development-app' do
       :mac_catalyst_enabled => false,
       # :ccache_enabled => true
     )
+
+    # Ensure ReactCodegen module map is available at path expected by the project.
+    # With use_frameworks!, CocoaPods may not create Headers/Public/React_Codegen.
+    pods_root = installer.sandbox.root
+    codegen_headers = File.join(pods_root, 'Headers', 'Public', 'React_Codegen')
+    codegen_target_support = File.join(pods_root, 'Target Support Files', 'ReactCodegen')
+    [codegen_headers].each do |dir|
+      FileUtils.mkdir_p(dir) unless File.directory?(dir)
+    end
+    modulemap_src = File.join(codegen_target_support, 'ReactCodegen.modulemap')
+    modulemap_dst = File.join(codegen_headers, 'React-Codegen.modulemap')
+    umbrella_src = File.join(codegen_target_support, 'ReactCodegen-umbrella.h')
+    umbrella_dst = File.join(codegen_headers, 'ReactCodegen-umbrella.h')
+    FileUtils.cp(modulemap_src, modulemap_dst) if File.exist?(modulemap_src)
+    FileUtils.cp(umbrella_src, umbrella_dst) if File.exist?(umbrella_src)
   end
 end