chore: bump react-native version to 0.69.0 (#1484)

* chore: TestsExample: set rn version to 0.69.0-rc.6 & react to 18.0.0

see https://react-native-community.github.io/upgrade-helper/?from=0.68.2&to=0.69.0-rc.6

* chore: TestsExample: run yarn install (update yarn.lock)

* chore: TestsExample: change target min. iOS version

see https://react-native-community.github.io/upgrade-helper/?from=0.68.2&to=0.69.0-rc.6

With lower version there are some dependency issues causing pod install
to fail (thats the visible efect, but there are some headers missing I
    guess)

* chore: TestsExample: install pods

* chore: TestsExample: update pbxproj file

* chore: FabricTestExample: bump react & react-native & other deps
versions

* chore: FabricTestExample: update yarn.lock

* chore: FabricTestExample: change target min. iOS version to 12.4

* chore: bump react, react-native versions in main package.json

* chore: set RNS_RN_VERSION_MINOR flag for all targets

* fix: use mountingTransactionDidMount:withSurfaceTelemetry: instead of
mountingTransationWillMountWithMetadata: for react-native minor version
>= 69

See: facebook/react-native@91fc2c0

* chore: reinstall pods in FabricTestExample

* chore: reinstall pods in TestsExample

* chore: bump react & react-native versions in FabricExample

* chore: FabricExample: change target min. iOS version

* chore: FabricExample: reinstall pods

* chore: bump gradlew wrapper version to 7.4.2 & kotlin plugin to 1.6.21

* fix: change ... TODO

* chore: 0.69.0 for FabricTestExample

* chore: 0.69.0 for FabricExample

* chore: 0.69.0 for TestsExample

* chore: resign from detecting react-native version in podspec

* chore: Fabric support from 0.69.0 onwards

* chore: install pods in FabricTestExample

* chore: add .xcode.env for FabricTestExample

* chore: adjust AppDelegate for FabricTestExample

* chore: changes for Android (FabricTestExample)

* chore: version update for ruby & flow

* chore: change call to mountingTransactionDidMount:withSurfaceTelemetry:
to mountingTransactionDidMount

* chore: add patch for safe-area-context

* chore: revert changes in /package.json

* chore: take snapshot iff deleted screen has component name of "RNSScreen"

* chore: bump rngh version to 2.5.0

* chore: use folly_runtime (breaking?)

This is potentially breaking for Paper!!!

* chore: run yarn install in main directory

* chore: update FabricExample

* chore: TestsExample: bump gesture-handler version to 2.5.0

* chore: bump kotlinVersion in TestsExample to 1.6.21

* chore: TestsExample: bump flow version to 0.176.3

* chore: upgrade helper changes for TestsExample

* chore: bump reanimated version

* chore: bump reanimated to 3.0.0

* chore: react-native-reanimated for 3.0.0-rc.0

* chore: react-native-reanimated 3.0.0-rc.0 for TestsExample

FabricExample/.flowconfig

@@ -62,4 +62,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.168.0
+^0.176.3

FabricExample/.gitignore

@@ -20,6 +20,7 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
+ios/.xcode.env.local
 
 # Android/IntelliJ
 #
@@ -49,9 +50,10 @@ buck-out/
 # For more information about the recommended setup visit:
 # https://docs.fastlane.tools/best-practices/source-control/
 
-*/fastlane/report.xml
-*/fastlane/Preview.html
-*/fastlane/screenshots
+**/fastlane/report.xml
+**/fastlane/Preview.html
+**/fastlane/screenshots
+**/fastlane/test_output
 
 # Bundle artifact
 *.jsbundle

FabricExample/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
-ruby '2.7.0'
+ruby '2.7.5'
 
 gem 'cocoapods', '~> 1.11', '>= 1.11.2'

FabricExample/_ruby-version

@@ -1 +1 @@
-2.7.0
+2.7.5

FabricExample/android/app/build.gradle

@@ -153,7 +153,8 @@ android {
                         "GENERATED_SRC_DIR=$buildDir/generated/source",
                         "PROJECT_BUILD_DIR=$buildDir",
                         "REACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
-                        "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build"
+                        "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build",
+                        "NODE_MODULES_DIR=$rootDir/../node_modules"
                     cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
                     cppFlags "-std=c++17"
                     // Make sure this target name is the same you specify inside the
@@ -270,9 +271,10 @@ dependencies {
     }
 
     if (enableHermes) {
-        def hermesPath = "../../node_modules/hermes-engine/android/";
-        debugImplementation files(hermesPath + "hermes-debug.aar")
-        releaseImplementation files(hermesPath + "hermes-release.aar")
+        //noinspection GradleDynamicVersion
+        implementation("com.facebook.react:hermes-engine:+") { // From node_modules
+            exclude group:'com.facebook.fbjni'
+        }
     } else {
         implementation jscFlavor
     }

FabricExample/android/app/src/main/java/com/fabricexample/MainActivity.java

@@ -17,13 +17,21 @@ protected String getMainComponentName() {
 
   /**
    * Returns the instance of the {@link ReactActivityDelegate}. There the RootView is created and
-   * you can specify the rendered you wish to use (Fabric or the older renderer).
+   * you can specify the renderer you wish to use - the new renderer (Fabric) or the old renderer
+   * (Paper).
    */
   @Override
   protected ReactActivityDelegate createReactActivityDelegate() {
     return new MainActivityDelegate(this, getMainComponentName());
   }
 
+  @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;
+  }
+
   public static class MainActivityDelegate extends ReactActivityDelegate {
     public MainActivityDelegate(ReactActivity activity, String mainComponentName) {
       super(activity, mainComponentName);

FabricExample/android/app/src/main/java/com/fabricexample/newarchitecture/MainApplicationReactNativeHost.java

@@ -17,6 +17,7 @@
 import com.facebook.react.fabric.ComponentFactory;
 import com.facebook.react.fabric.CoreComponentsRegistry;
 import com.facebook.react.fabric.EmptyReactNativeConfig;
+import com.facebook.react.fabric.ReactNativeConfig;
 import com.facebook.react.fabric.FabricJSIModuleProvider;
 import com.facebook.react.uimanager.ViewManagerRegistry;
 import com.fabricexample.BuildConfig;
@@ -106,7 +107,7 @@ public JSIModuleProvider<UIManager> getJSIModuleProvider() {
                 return new FabricJSIModuleProvider(
                     reactApplicationContext,
                     componentFactory,
-                    new EmptyReactNativeConfig(),
+                    ReactNativeConfig.DEFAULT_CONFIG,
                     viewManagerRegistry);
               }
             });

FabricExample/android/app/src/main/jni/Android.mk

@@ -29,8 +29,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_SHARED_LIBRARIES := \
   libfabricjni \
   libfbjni \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog \
   libjsi \
   libreact_codegen_rncore \

FabricExample/android/build.gradle

@@ -13,9 +13,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.0.1")
+        classpath("com.android.tools.build:gradle:7.1.1")
         classpath("com.facebook.react:react")
-        classpath("de.undercouch:gradle-download-task:4.1.1")
+        classpath("de.undercouch:gradle-download-task:5.0.1")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

FabricExample/android/settings.gradle

@@ -10,4 +10,6 @@ includeBuild('../node_modules/react-native-gradle-plugin') {
 if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
     include(":ReactAndroid")
     project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid')
+    include(":ReactAndroid:hermes-engine")
+    project(":ReactAndroid:hermes-engine").projectDir = file('../node_modules/react-native/ReactAndroid/hermes-engine')
 }

FabricExample/ios/.xcode.env

@@ -0,0 +1,11 @@
+
+# This `.xcode.env` file is versioned and is used to source the environment
+# used when running script phases inside Xcode.
+# To customize your local environment, you can create an `.xcode.env.local`
+# file that is not versioned.
+# NODE_BINARY variable contains the PATH to the node executable.
+#
+# Customize the NODE_BINARY variable here.
+# For example, to use nvm with brew, add the following line
+# . "$(brew --prefix nvm)/nvm.sh" --no-use
+export NODE_BINARY=$(command -v node)

FabricExample/ios/FabricExample.xcodeproj/project.pbxproj

@@ -594,6 +594,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
 			name = Debug;
@@ -657,6 +658,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};

FabricExample/ios/FabricExample/AppDelegate.mm

@@ -16,6 +16,9 @@
 
 #import <react/config/ReactNativeConfig.h>
 
+static NSString *const kRNConcurrentRoot = @"concurrentRoot";
+
+
 @interface AppDelegate () <RCTCxxBridgeDelegate, RCTTurboModuleManagerDelegate> {
   RCTTurboModuleManager *_turboModuleManager;
   RCTSurfacePresenterBridgeAdapter *_bridgeAdapter;
@@ -41,7 +44,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   bridge.surfacePresenter = _bridgeAdapter.surfacePresenter;
 #endif
 
-  UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"FabricExample", nil);
+  NSDictionary *initProps = [self prepareInitialProps];
+  UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"FabricExample", initProps);
 
   if (@available(iOS 13.0, *)) {
     rootView.backgroundColor = [UIColor systemBackgroundColor];
@@ -57,6 +61,25 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   return YES;
 }
 
+/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off.
+///
+/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html
+/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture).
+/// @return: `true` if the `concurrentRoot` feture is enabled. Otherwise, it returns `false`.
+- (BOOL)concurrentRootEnabled
+{
+  // Switch this bool to turn on and off the concurrent root
+  return true;
+}
+- (NSDictionary *)prepareInitialProps
+{
+  NSMutableDictionary *initProps = [NSMutableDictionary new];
+#ifdef RCT_NEW_ARCH_ENABLED
+  initProps[kRNConcurrentRoot] = @([self concurrentRootEnabled]);
+#endif
+  return initProps;
+}
+
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
 #if DEBUG

FabricExample/ios/Podfile

@@ -1,7 +1,7 @@
 require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
-platform :ios, '11.0'
+platform :ios, '12.4'
 install! 'cocoapods', :deterministic_uuids => false
 
 ENV['RCT_NEW_ARCH_ENABLED'] = '1'