Merge branch 'master' into feat/8011-android-enable-more-tests

Author: gosha212

ReactNativeNavigation.podspec

@@ -1,19 +1,26 @@
 require 'json'
+require 'find'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 
 # Detect if this is a Swift project by looking for user AppDelegate.swift files
-dependency_paths = ['/node_modules/', '/Pods/', '/build/', '/Build/', '/DerivedData/']
-swift_project = Dir.glob('**/AppDelegate.swift')
-                   .reject { |file| dependency_paths.any? { |path| file.include?(path) } }
-                   .any?
+start_dir = File.expand_path('../../', __dir__)
+swift_delegate_path = nil
+Find.find(start_dir) do |path|
+  if path =~ /AppDelegate\.swift$/
+    swift_delegate_path = path
+    break
+  end
+end
+
+swift_project = swift_delegate_path && File.exist?(swift_delegate_path)
 
 # Debug output
 if swift_project
   puts "ReactNativeNavigation: Swift AppDelegate detected - enabling Swift-compatible configuration"
-else  
+else
   puts "ReactNativeNavigation: Objective-C AppDelegate detected - using standard configuration"
 end
 
@@ -43,19 +50,19 @@ Pod::Spec.new do |s|
   end
 
   folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DFOLLY_CFG_NO_COROUTINES=1'
-  
+
   # Base xcconfig settings
   xcconfig_settings = {
       'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native"  "$(PODS_ROOT)/RCT-Folly" "$(PODS_ROOT)/Headers/Private/React-Core" "$(PODS_ROOT)/Headers/Private/Yoga"',
       "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
       "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
   }
-  
+
   # Only add DEFINES_MODULE for Swift projects
   if swift_project
     xcconfig_settings["DEFINES_MODULE"] = "YES"
   end
-  
+
   s.pod_target_xcconfig = xcconfig_settings
 
   if fabric_enabled

autolink/fixtures/rn68/MainActivity.java.template

@@ -0,0 +1,22 @@
+package com.app
+
+import com.facebook.react.ReactActivity
+import com.facebook.react.ReactActivityDelegate
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
+import com.facebook.react.defaults.DefaultReactActivityDelegate
+
+class MainActivity : ReactActivity() {
+
+  /**
+   * Returns the name of the main component registered from JavaScript. This is used to schedule
+   * rendering of the component.
+   */
+  override fun getMainComponentName(): String = "rn770"
+
+  /**
+   * Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate]
+   * which allows you to enable New Architecture with a single boolean flags [fabricEnabled]
+   */
+  override fun createReactActivityDelegate(): ReactActivityDelegate =
+      DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
+}

autolink/fixtures/rn69/MainActivity.java.template

@@ -0,0 +1,44 @@
+package com.app
+
+import android.app.Application
+import com.facebook.react.PackageList
+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.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> =
+            PackageList(this).packages.apply {
+              // Packages that cannot be autolinked yet can be added manually here, for example:
+              // add(MyReactNativePackage())
+            }
+
+        override fun getJSMainModuleName(): String = "index"
+
+        override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
+
+        override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+        override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
+      }
+
+  override val reactHost: ReactHost
+    get() = getDefaultReactHost(applicationContext, reactNativeHost)
+
+  override fun onCreate() {
+    super.onCreate()
+    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()
+    }
+  }
+}

autolink/fixtures/rn71/MainActivity.java.template

@@ -0,0 +1,21 @@
+buildscript {
+    ext {
+        buildToolsVersion = "35.0.0"
+        minSdkVersion = 24
+        compileSdkVersion = 35
+        targetSdkVersion = 35
+        ndkVersion = "27.1.12297006"
+        kotlinVersion = "2.0.21"
+    }
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath("com.android.tools.build:gradle")
+        classpath("com.facebook.react:react-native-gradle-plugin")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
+    }
+}
+
+apply plugin: "com.facebook.react.rootproject"

autolink/fixtures/rn77/MainActivity.kt.template

@@ -0,0 +1,24 @@
+const prepareFixtureDuplicate = ({ rnVersion, userFixtureFileName, patchedFixtureFileName }) => {
+  const fs = require('node:fs');
+  const path = require('node:path');
+  const os = require('node:os');
+
+  const userFixtureRelPath = _getRelativeFixturePath(rnVersion, userFixtureFileName);
+
+  const userFixturePath = path.resolve(userFixtureRelPath);
+  const patchedFixturePath = path.resolve(os.tmpdir(), patchedFixtureFileName);
+  fs.copyFileSync(userFixturePath, patchedFixturePath);
+
+  return patchedFixturePath;
+};
+
+const _getRelativeFixturePath = (rnVersion, fixtureFileName) => {
+  const path = require('node:path');
+  return path.join('autolink', 'fixtures', `rn${rnVersion}`, fixtureFileName);
+};
+
+module.exports = {
+  prepareFixtureDuplicate,
+  prepareFixtureDuplicate77: ({ userFixtureFileName, patchedFixtureFileName }) =>
+    prepareFixtureDuplicate({ rnVersion: '77', userFixtureFileName, patchedFixtureFileName }),
+};

autolink/fixtures/rn77/MainApplication.kt.template

@@ -0,0 +1,11 @@
+module.exports = {
+  log: console.log,
+  logn: console.log,
+  warn: console.log,
+  warnn: console.log,
+  info: console.log,
+  infon: console.log,
+  debug: console.log,
+  debugn: console.log,
+  errorn: console.log,
+};

autolink/fixtures/rn77/build.gradle.template

@@ -1,82 +1,14 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`activityLinker should work for RN 0.68 1`] = `
-"package com.app;
+exports[`activityLinker should work for RN 0.77 1`] = `
+"package com.app
 
-import com.reactnativenavigation.NavigationActivity;
-import com.facebook.react.ReactActivityDelegate;
-import com.facebook.react.ReactRootView;
+import com.reactnativenavigation.NavigationActivity
+import com.facebook.react.ReactActivityDelegate
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
+import com.facebook.react.defaults.DefaultReactActivityDelegate
 
-public class MainActivity extends NavigationActivity {
-
-  
-
-  
-
-  public static class MainActivityDelegate extends ReactActivityDelegate {
-    public MainActivityDelegate(NavigationActivity activity, String mainComponentName) {
-      super(activity, mainComponentName);
-    }
-
-    @Override
-    protected ReactRootView createRootView() {
-      ReactRootView reactRootView = new ReactRootView(getContext());
-      // If you opted-in for the New Architecture, we enable the Fabric Renderer.
-      reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED);
-      return reactRootView;
-    }
-  }
-}
-"
-`;
-
-exports[`activityLinker should work for RN 0.69 1`] = `
-"package com.app;
-
-import com.reactnativenavigation.NavigationActivity;
-import com.facebook.react.ReactActivityDelegate;
-import com.facebook.react.ReactRootView;
-
-public class MainActivity extends NavigationActivity {
-
-  
-
-  
-
-  public static class MainActivityDelegate extends ReactActivityDelegate {
-    public MainActivityDelegate(NavigationActivity activity, String mainComponentName) {
-      super(activity, mainComponentName);
-    }
-
-    @Override
-    protected ReactRootView createRootView() {
-      ReactRootView reactRootView = new ReactRootView(getContext());
-      // If you opted-in for the New Architecture, we enable the Fabric Renderer.
-      reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED);
-      return reactRootView;
-    }
-
-    @Override
-    protected boolean isConcurrentRootEnabled() {
-      // If you opted-in for the New Architecture, we enable Concurrent Root (i.e. React 18).
-      // More on this on https://reactjs.org/blog/2022/03/29/react-v18.html
-      return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
-    }
-  }
-}
-"
-`;
-
-
-exports[`activityLinker should work for RN 0.71 1`] = `
-"package com.app;
-
-import com.reactnativenavigation.NavigationActivity;
-import com.facebook.react.ReactActivityDelegate;
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
-import com.facebook.react.defaults.DefaultReactActivityDelegate;
-
-public class MainActivity extends NavigationActivity {
+class MainActivity : NavigationActivity() {