react-native 0.68.0-rc.1 → 0.68.0-rc.4

package/Libraries/Blob/React-RCTBlob.podspec

@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig    = {
                                "USE_HEADERMAP" => "YES",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\""
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
                              }
 
   s.dependency "RCT-Folly", folly_version

package/Libraries/Components/Switch/Switch.js

@@ -170,7 +170,8 @@ const SwitchWithForwardedRef: React.AbstractComponent<
     // that the update should be ignored and we should stick with the value
     // that we have in JS.
     const jsValue = value === true;
-    const shouldUpdateNativeSwitch = native.value !== jsValue;
+    const shouldUpdateNativeSwitch =
+      native.value != null && native.value !== jsValue;
     if (
       shouldUpdateNativeSwitch &&
       nativeSwitchRef.current?.setNativeProps != null

package/Libraries/Core/ReactNativeVersion.js

@@ -13,5 +13,5 @@ exports.version = {
   major: 0,
   minor: 68,
   patch: 0,
-  prerelease: 'rc.1',
+  prerelease: 'rc.4',
 };

package/Libraries/Image/React-RCTImage.podspec

@@ -36,7 +36,7 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig    = {
                                "USE_HEADERMAP" => "YES",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\""
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
                              }
 
   s.dependency "RCT-Folly", folly_version

package/Libraries/LinkingIOS/React-RCTLinking.podspec

@@ -36,7 +36,7 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig    = {
                                "USE_HEADERMAP" => "YES",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\""
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
                              }
 
   s.dependency "React-Codegen", version

package/Libraries/NativeAnimation/React-RCTAnimation.podspec

@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig    = {
                                "USE_HEADERMAP" => "YES",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\""
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
                              }
 
   s.dependency "RCT-Folly", folly_version

package/Libraries/Network/React-RCTNetwork.podspec

@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig    = {
                                "USE_HEADERMAP" => "YES",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\""
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
                              }
   s.frameworks             = "MobileCoreServices"
 

package/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec

@@ -36,7 +36,7 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig    = {
                                "USE_HEADERMAP" => "YES",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\""
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
                              }
   s.framework              = "UserNotifications"
 

package/Libraries/Settings/React-RCTSettings.podspec

@@ -36,7 +36,7 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig    = {
                                "USE_HEADERMAP" => "YES",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\""
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
                              }
 
   s.dependency "RCT-Folly", folly_version

package/Libraries/Text/TextInput/Multiline/RCTUITextView.m

@@ -147,21 +147,7 @@ static UIColor *defaultPlaceholderColor()
 
 - (void)setAttributedText:(NSAttributedString *)attributedText
 {
-  // Using `setAttributedString:` while user is typing breaks some internal mechanics
-  // when entering complex input languages such as Chinese, Korean or Japanese.
-  // see: https://github.com/facebook/react-native/issues/19339
-
-  // We try to avoid calling this method as much as we can.
-  // If the text has changed, there is nothing we can do.
-  if (![super.attributedText.string isEqualToString:attributedText.string]) {
-    [super setAttributedText:attributedText];
-  } else {
-  // But if the text is preserved, we just copying the attributes from the source string.
-    if (![super.attributedText isEqualToAttributedString:attributedText]) {
-      [self copyTextAttributesFrom:attributedText];
-    }
-  }
-
+  [super setAttributedText:attributedText];
   [self textDidChange];
 }
 
@@ -311,18 +297,4 @@ static UIColor *defaultPlaceholderColor()
 
 #pragma mark - Utility Methods
 
-- (void)copyTextAttributesFrom:(NSAttributedString *)sourceString
-{
-  [self.textStorage beginEditing];
-
-  NSTextStorage *textStorage = self.textStorage;
-  [sourceString enumerateAttributesInRange:NSMakeRange(0, sourceString.length)
-                                   options:NSAttributedStringEnumerationReverse
-                                usingBlock:^(NSDictionary<NSAttributedStringKey,id> * _Nonnull attrs, NSRange range, BOOL * _Nonnull stop) {
-                                  [textStorage setAttributes:attrs range:range];
-                                }];
-
-  [self.textStorage endEditing];
-}
-
 @end

package/Libraries/Text/TextInput/RCTBaseTextInputView.m

@@ -104,6 +104,7 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
   // Similarly, when the user is in the middle of inputting some text in Japanese/Chinese, there will be styling on the
   // text that we should disregard. See https://developer.apple.com/documentation/uikit/uitextinput/1614489-markedtextrange?language=objc
   // for more info.
+  // Also, updating the attributed text while inputting Korean language will break input mechanism.
   // If the user added an emoji, the system adds a font attribute for the emoji and stores the original font in NSOriginalFont.
   // Lastly, when entering a password, etc., there will be additional styling on the field as the native text view
   // handles showing the last character for a split second.
@@ -116,6 +117,7 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
 
   BOOL shouldFallbackToBareTextComparison =
     [self.backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"dictation"] ||
+    [self.backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"ko-KR"] ||
     self.backedTextInputView.markedTextRange ||
     self.backedTextInputView.isSecureTextEntry ||
     fontHasBeenUpdatedBySystem;

package/Libraries/Vibration/React-RCTVibration.podspec

@@ -36,7 +36,7 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig    = {
                                "USE_HEADERMAP" => "YES",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\""
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
                              }
   s.frameworks             = "AudioToolbox"
 

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(68),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"rc.1",
+                  RCTVersionPrerelease: @"rc.4",
                   };
   });
   return __rnVersion;

package/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm

@@ -73,13 +73,10 @@ static RCTRootViewSizeFlexibility convertToRootViewSizeFlexibility(RCTSurfaceSiz
   // `RCTRootViewSizeFlexibilityNone` is the RCTRootView's default.
   RCTSurfaceSizeMeasureMode sizeMeasureMode = convertToSurfaceSizeMeasureMode(RCTRootViewSizeFlexibilityNone);
 
-  id<RCTSurfaceProtocol> surface = [[self class] createSurfaceWithBridge:bridge
-                                                              moduleName:moduleName
-                                                       initialProperties:initialProperties];
-  [surface start];
-  if (self = [super initWithSurface:surface sizeMeasureMode:sizeMeasureMode]) {
-    // Nothing specific to do.
-  }
+  self = [super initWithBridge:bridge
+                    moduleName:moduleName
+             initialProperties:initialProperties
+               sizeMeasureMode:sizeMeasureMode];
 
   RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
 

package/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm

@@ -46,8 +46,10 @@ RCT_NOT_IMPLEMENTED(-(nullable instancetype)initWithCoder : (NSCoder *)coder)
   id<RCTSurfaceProtocol> surface = [[self class] createSurfaceWithBridge:bridge
                                                               moduleName:moduleName
                                                        initialProperties:initialProperties];
-  [surface start];
-  return [self initWithSurface:surface sizeMeasureMode:sizeMeasureMode];
+  if (self = [self initWithSurface:surface sizeMeasureMode:sizeMeasureMode]) {
+    [surface start];
+  }
+  return self;
 }
 
 - (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface

package/React/CoreModules/React-CoreModules.podspec

@@ -34,7 +34,7 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig    = {
                                "USE_HEADERMAP" => "YES",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/React/CoreModules\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\""
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/React/CoreModules\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
                              }
 
   s.dependency "React-Codegen", version

package/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm

@@ -617,8 +617,9 @@ using namespace facebook::react;
   // the settings on a dictation.
   // Similarly, when the user is in the middle of inputting some text in Japanese/Chinese, there will be styling on the
   // text that we should disregard. See
-  // https://developer.apple.com/documentation/uikit/uitextinput/1614489-markedtextrange?language=objc for more info. If
-  // the user added an emoji, the system adds a font attribute for the emoji and stores the original font in
+  // https://developer.apple.com/documentation/uikit/uitextinput/1614489-markedtextrange?language=objc for more info.
+  // Also, updating the attributed text while inputting Korean language will break input mechanism.
+  // If the user added an emoji, the system adds a font attribute for the emoji and stores the original font in
   // NSOriginalFont. Lastly, when entering a password, etc., there will be additional styling on the field as the native
   // text view handles showing the last character for a split second.
   __block BOOL fontHasBeenUpdatedBySystem = false;
@@ -633,6 +634,7 @@ using namespace facebook::react;
 
   BOOL shouldFallbackToBareTextComparison =
       [_backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"dictation"] ||
+      [_backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"ko-KR"] ||
       _backedTextInputView.markedTextRange || _backedTextInputView.isSecureTextEntry || fontHasBeenUpdatedBySystem;
 
   if (shouldFallbackToBareTextComparison) {

package/React/React-RCTFabric.podspec

@@ -36,7 +36,7 @@ Pod::Spec.new do |s|
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.header_dir             = "React"
   s.framework              = "JavaScriptCore"
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Public/React-Codegen\"" }
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Public/React-Codegen\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" }
   s.xcconfig               = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/RCT-Folly\"",
                                "OTHER_CFLAGS" => "$(inherited) -DRN_FABRIC_ENABLED" + " " + folly_flags  }
 

package/ReactAndroid/build.gradle

@@ -406,7 +406,7 @@ react {
     // This should be changed to a more generic name, e.g. `ReactCoreSpec`.
     libraryName = "rncore"
     jsRootDir = file("../Libraries")
-    reactRoot = file("$projectDir/..")
+    reactNativeDir = file("$projectDir/..")
     useJavaGenerator = System.getenv("USE_CODEGEN_JAVAPOET")?.toBoolean() ?: false
     // We search for the codegen in either one of the `node_modules` folder or in the
     // root packages folder (that's for when we build from source without calling `yarn install`).

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.68.0-rc.1
+VERSION_NAME=0.68.0-rc.4
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative

package/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java

@@ -102,9 +102,6 @@ public class ReactFeatureFlags {
 
   public static boolean insertZReorderBarriersOnViewGroupChildren = true;
 
-  /** TODO: T103427072 Delete ReactFeatureFlags.enableNestedTextOnPressEventFix */
-  public static boolean enableNestedTextOnPressEventFix = true;
-
   /** TODO: T107492383 Delete this flag. Enables postprocessor for rounded corners for Image */
   public static boolean enableRoundedCornerPostprocessing = false;
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -18,5 +18,5 @@ public class ReactNativeVersion {
       "major", 0,
       "minor", 68,
       "patch", 0,
-      "prerelease", "rc.1");
+      "prerelease", "rc.4");
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java

@@ -343,11 +343,6 @@ public class ReactTextShadowNode extends ReactBaseTextShadowNode {
               mJustificationMode);
       uiViewOperationQueue.enqueueUpdateExtraData(getReactTag(), reactTextUpdate);
     }
-
-    if (mAdjustsFontSizeToFit) {
-      // Nodes with `adjustsFontSizeToFit` enabled need to be remeasured on every relayout.
-      markUpdated();
-    }
   }
 
   @ReactProp(name = "onTextLayout")

package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java

@@ -19,7 +19,6 @@ import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.text.util.Linkify;
 import android.view.Gravity;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.Nullable;
@@ -32,7 +31,6 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.ReactConstants;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactCompoundView;
 import com.facebook.react.uimanager.UIManagerModule;
@@ -384,16 +382,6 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
     return target;
   }
 
-  @Override
-  public boolean onTouchEvent(MotionEvent ev) {
-    // The root view always assumes any view that was tapped wants the touch
-    // and sends the event to JS as such.
-    // We don't need to do bubbling in native (it's already happening in JS).
-    // For an explanation of bubbling and capturing, see
-    // http://javascript.info/tutorial/bubbling-and-capturing#capturing
-    return ReactFeatureFlags.enableNestedTextOnPressEventFix;
-  }
-
   @Override
   protected boolean verifyDrawable(Drawable drawable) {
     if (mContainsImages && getText() instanceof Spanned) {

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -18,7 +18,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 68;
   int32_t Patch = 0;
-  std::string_view Prerelease = "rc.1";
+  std::string_view Prerelease = "rc.4";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp

@@ -33,11 +33,11 @@ MapBuffer::MapBuffer(std::vector<uint8_t> data) : bytes_(std::move(data)) {
   }
 }
 
-uint32_t MapBuffer::getKeyBucket(Key key) const {
-  uint32_t lo = 0;
-  uint32_t hi = count_ - 1;
+int32_t MapBuffer::getKeyBucket(Key key) const {
+  int32_t lo = 0;
+  int32_t hi = count_ - 1;
   while (lo <= hi) {
-    uint32_t mid = (lo + hi) >> 1;
+    int32_t mid = (lo + hi) >> 1;
 
     Key midVal =
         *reinterpret_cast<Key const *>(bytes_.data() + bucketOffset(mid));
@@ -112,7 +112,7 @@ MapBuffer MapBuffer::getMapBuffer(Key key) const {
   return MapBuffer(std::move(value));
 }
 
-uint32_t MapBuffer::size() const {
+size_t MapBuffer::size() const {
   return bytes_.size();
 }
 

package/ReactCommon/react/renderer/mapbuffer/MapBuffer.h

@@ -80,7 +80,8 @@ class MapBuffer {
     uint32_t bufferSize; // Amount of bytes used to store the map in memory
   };
 
-  struct __attribute__((__packed__)) Bucket {
+#pragma pack(push, 1)
+  struct Bucket {
     Key key;
     uint16_t type;
     uint64_t data;
@@ -88,6 +89,7 @@ class MapBuffer {
     Bucket(Key key, uint16_t type, uint64_t data)
         : key(key), type(type), data(data) {}
   };
+#pragma pack(pop)
 
   static_assert(sizeof(Header) == 8, "MapBuffer header size is incorrect.");
   static_assert(sizeof(Bucket) == 12, "MapBuffer bucket size is incorrect.");
@@ -124,7 +126,7 @@ class MapBuffer {
   // TODO T83483191: review this declaration
   MapBuffer getMapBuffer(MapBuffer::Key key) const;
 
-  uint32_t size() const;
+  size_t size() const;
 
   uint8_t const *data() const;
 
@@ -140,7 +142,7 @@ class MapBuffer {
   // returns the relative offset of the first byte of dynamic data
   int32_t getDynamicDataOffset() const;
 
-  uint32_t getKeyBucket(MapBuffer::Key key) const;
+  int32_t getKeyBucket(MapBuffer::Key key) const;
 
   friend ReadableMapBuffer;
 };

package/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.cpp

@@ -14,7 +14,7 @@ namespace facebook {
 namespace react {
 
 constexpr uint32_t INT_SIZE = sizeof(uint32_t);
-constexpr double DOUBLE_SIZE = sizeof(double);
+constexpr uint32_t DOUBLE_SIZE = sizeof(double);
 constexpr uint32_t MAX_BUCKET_VALUE_SIZE = sizeof(uint64_t);
 
 MapBuffer MapBufferBuilder::EMPTY() {
@@ -23,6 +23,8 @@ MapBuffer MapBufferBuilder::EMPTY() {
 
 MapBufferBuilder::MapBufferBuilder(uint32_t initialSize) {
   buckets_.reserve(initialSize);
+  header_.count = 0;
+  header_.bufferSize = 0;
 }
 
 void MapBufferBuilder::storeKeyValue(
@@ -76,7 +78,7 @@ void MapBufferBuilder::putInt(MapBuffer::Key key, int32_t value) {
 }
 
 void MapBufferBuilder::putString(MapBuffer::Key key, std::string const &value) {
-  int32_t strSize = value.size();
+  auto strSize = value.size();
   const char *strData = value.data();
 
   // format [length of string (int)] + [Array of Characters in the string]
@@ -94,7 +96,7 @@ void MapBufferBuilder::putString(MapBuffer::Key key, std::string const &value) {
 }
 
 void MapBufferBuilder::putMapBuffer(MapBuffer::Key key, MapBuffer const &map) {
-  int32_t mapBufferSize = map.size();
+  auto mapBufferSize = map.size();
 
   auto offset = dynamicData_.size();
 
@@ -122,9 +124,9 @@ MapBuffer MapBufferBuilder::build() {
   // Create buffer: [header] + [key, values] + [dynamic data]
   auto bucketSize = buckets_.size() * sizeof(MapBuffer::Bucket);
   auto headerSize = sizeof(MapBuffer::Header);
-  uint32_t bufferSize = headerSize + bucketSize + dynamicData_.size();
+  auto bufferSize = headerSize + bucketSize + dynamicData_.size();
 
-  header_.bufferSize = bufferSize;
+  header_.bufferSize = static_cast<uint32_t>(bufferSize);
 
   if (needsSort_) {
     std::sort(buckets_.begin(), buckets_.end(), compareBuckets);

package/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h

@@ -38,7 +38,7 @@ class MapBufferBuilder {
   MapBuffer build();
 
  private:
-  MapBuffer::Header header_ = {.count = 0, .bufferSize = 0};
+  MapBuffer::Header header_;
 
   std::vector<MapBuffer::Bucket> buckets_{};
 

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4-sources.jar.md5

@@ -0,0 +1 @@
+061d9969695be61bee0e5e1da9fdea79

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4-sources.jar.sha1

@@ -0,0 +1 @@
+150b7a188a54d40798935d447e3047e995334422

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4-sources.jar.sha256

@@ -0,0 +1 @@
+618f6eb909a92a352bbb839c00cd0f4b776a6123642352baf2bee0ed874de0f6

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4-sources.jar.sha512

@@ -0,0 +1 @@
+5b224b392a51e5fab6ad43f5c9d1ffb0df9786336785e85b1abcc7cf4a572c2193766068c24ad00649940369bbd3d042e9011de2c0408009de74d4cc0d82ad28

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.aar.md5

@@ -0,0 +1 @@
+21bbd956d29f733e5079798166b5b221

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.aar.sha1

@@ -0,0 +1 @@
+88f701d2a7428778ad561ba69f7b4aad80a4a74b

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.aar.sha256

@@ -0,0 +1 @@
+5828625bb3c9ac9d98b6de0b2559dfd63af35ea19811af169eecad1e509ac12e

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.aar.sha512

@@ -0,0 +1 @@
+7684c75039e3b9ec07cdfd39214e04f28730285bbe5773a55b18fd278db8cef339a39285f0baaecdabf01a205cbdfc704539288ae03b020725ca07f79b704414

package/android/com/facebook/react/react-native/{0.68.0-rc.1/react-native-0.68.0-rc.1.module → 0.68.0-rc.4/react-native-0.68.0-rc.4.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "com.facebook.react",
     "module": "react-native",
-    "version": "0.68.0-rc.1",
+    "version": "0.68.0-rc.4",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -131,13 +131,13 @@
       ],
       "files": [
         {
-          "name": "react-native-0.68.0-rc.1.aar",
-          "url": "react-native-0.68.0-rc.1.aar",
-          "size": 16395276,
-          "sha512": "2959cdc03a904f7f6845c88d017432592a04c96283018287625735536ea92cef4fe29393809c5b7e63fdb13097c4b8fbaf4ea22c4cfab99a1a9dc13bedd62d8f",
-          "sha256": "6073f03f09bda95a8b83931de5e7f046bda458296fa3c9760454205c2e353957",
-          "sha1": "115c2ad91875cab758d40483cfb0aba6c6eff212",
-          "md5": "52df61c91e6e1dc484b6f7041da9ce3e"
+          "name": "react-native-0.68.0-rc.4.aar",
+          "url": "react-native-0.68.0-rc.4.aar",
+          "size": 16395231,
+          "sha512": "7684c75039e3b9ec07cdfd39214e04f28730285bbe5773a55b18fd278db8cef339a39285f0baaecdabf01a205cbdfc704539288ae03b020725ca07f79b704414",
+          "sha256": "5828625bb3c9ac9d98b6de0b2559dfd63af35ea19811af169eecad1e509ac12e",
+          "sha1": "88f701d2a7428778ad561ba69f7b4aad80a4a74b",
+          "md5": "21bbd956d29f733e5079798166b5b221"
         }
       ]
     },
@@ -258,13 +258,13 @@
       ],
       "files": [
         {
-          "name": "react-native-0.68.0-rc.1.aar",
-          "url": "react-native-0.68.0-rc.1.aar",
-          "size": 16395276,
-          "sha512": "2959cdc03a904f7f6845c88d017432592a04c96283018287625735536ea92cef4fe29393809c5b7e63fdb13097c4b8fbaf4ea22c4cfab99a1a9dc13bedd62d8f",
-          "sha256": "6073f03f09bda95a8b83931de5e7f046bda458296fa3c9760454205c2e353957",
-          "sha1": "115c2ad91875cab758d40483cfb0aba6c6eff212",
-          "md5": "52df61c91e6e1dc484b6f7041da9ce3e"
+          "name": "react-native-0.68.0-rc.4.aar",
+          "url": "react-native-0.68.0-rc.4.aar",
+          "size": 16395231,
+          "sha512": "7684c75039e3b9ec07cdfd39214e04f28730285bbe5773a55b18fd278db8cef339a39285f0baaecdabf01a205cbdfc704539288ae03b020725ca07f79b704414",
+          "sha256": "5828625bb3c9ac9d98b6de0b2559dfd63af35ea19811af169eecad1e509ac12e",
+          "sha1": "88f701d2a7428778ad561ba69f7b4aad80a4a74b",
+          "md5": "21bbd956d29f733e5079798166b5b221"
         }
       ]
     }

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.module.md5

@@ -0,0 +1 @@
+ea227da923feb56c842bca62a5edbdf8

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.module.sha1

@@ -0,0 +1 @@
+166f02b50fc554b52c51d4415462181f08e37ada

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.module.sha256

@@ -0,0 +1 @@
+28869b35c16971c8a71a5065cdc54711c72239daf8a6bf8e3b6b454225a6625d

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.module.sha512

@@ -0,0 +1 @@
+9bfeb1156cdf69f64b8efe53dfee2b65922bd845a067c76faa78412b71e854144ccf970669ce2d90ecad5eba7bf448b1fa8fe8c6b1676156c24003e473618ab8

package/android/com/facebook/react/react-native/{0.68.0-rc.1/react-native-0.68.0-rc.1.pom → 0.68.0-rc.4/react-native-0.68.0-rc.4.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
-  <version>0.68.0-rc.1</version>
+  <version>0.68.0-rc.4</version>
   <packaging>aar</packaging>
   <name>ReactNative</name>
   <description>A framework for building native apps with React</description>

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.pom.md5

@@ -0,0 +1 @@
+ef0589b2d1fe974acc20fb19ae30797f

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.pom.sha1

@@ -0,0 +1 @@
+b2bfa3ece500979326dedf024d52780f20289959

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.pom.sha256

@@ -0,0 +1 @@
+21461eb4d8808531bb3d540bb6108519ce2006b76569e732193448fa57d23492

package/android/com/facebook/react/react-native/0.68.0-rc.4/react-native-0.68.0-rc.4.pom.sha512

@@ -0,0 +1 @@
+a337720a2e0f8aada7e7cbd965b69bb51af5299d962e1062f573acf179a010b8e7474b1a0dfea0fa1d15c82998e75e2f241276ccc10bbee0044f79c0987025ae

package/android/com/facebook/react/react-native/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
   <versioning>
-    <latest>0.68.0-rc.1</latest>
-    <release>0.68.0-rc.1</release>
+    <latest>0.68.0-rc.4</latest>
+    <release>0.68.0-rc.4</release>
     <versions>
-      <version>0.68.0-rc.1</version>
+      <version>0.68.0-rc.4</version>
     </versions>
-    <lastUpdated>20220203174340</lastUpdated>
+    <lastUpdated>20220325145553</lastUpdated>
   </versioning>
 </metadata>

package/android/com/facebook/react/react-native/maven-metadata.xml.md5

@@ -1 +1 @@
-aa457a3e7ea2c6e4f0b8f6a08958c8ff
+61f8e5a1bfd4bd678d2d2dc4e4bd10e4

package/android/com/facebook/react/react-native/maven-metadata.xml.sha1

@@ -1 +1 @@
-5ceb80dd1d92fcdf0d07bdd822f5ba9f539eb7ef
+98d9276424850b7afa9efbbfa932fe0c28eb3feb

package/android/com/facebook/react/react-native/maven-metadata.xml.sha256

@@ -1 +1 @@
-0bd0710cd56264137900969f9ed30ea4c4f8a18eee068844a9fa3843e11b03b6
+9333d75067ea241417ed137094080f0062ba3a1ebed316d838d920b8205665ac

package/android/com/facebook/react/react-native/maven-metadata.xml.sha512

@@ -1 +1 @@
-70ade999243740c2e1f9494292a1aa855813555ff0b8428f638b13771d32ed6c6b842993f0d970498d5427b04f18ba9a956e9f73bffe979703ddbd3a11696f34
+16afea73a6fe60bd742ba7d2cf8144e8df3abcf1a9aa3d9651beb23346e567ba590ce9bad8523f5964c0a855b09fe77820d7c962de1466c678894dc87cb343a0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.68.0-rc.1",
+  "version": "0.68.0-rc.4",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",
@@ -87,7 +87,7 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^27.0.1",
-    "@react-native-community/cli": "^7.0.1",
+    "@react-native-community/cli": "^7.0.3",
     "@react-native-community/cli-platform-android": "^7.0.1",
     "@react-native-community/cli-platform-ios": "^7.0.1",
     "@react-native/assets": "1.0.0",
@@ -108,6 +108,7 @@
     "pretty-format": "^26.5.2",
     "promise": "^8.0.3",
     "react-devtools-core": "^4.23.0",
+    "react-native-gradle-plugin": "^0.0.5",
     "react-refresh": "^0.4.0",
     "react-shallow-renderer": "16.14.1",
     "regenerator-runtime": "^0.13.2",

package/react.gradle

@@ -6,6 +6,7 @@
  */
 
 import org.apache.tools.ant.taskdefs.condition.Os
+import org.gradle.internal.jvm.Jvm
 
 def config = project.hasProperty("react") ? project.react : [:];
 
@@ -21,20 +22,6 @@ def detectEntryFile(config) {
     return "index.js";
 }
 
-/**
- * Detects CLI location in a similar fashion to the React Native CLI
- */
-def detectCliPath(config) {
-    if (config.cliPath) {
-        return "${projectDir}/${config.cliPath}"
-    }
-    if (new File("${projectDir}/../../node_modules/react-native/cli.js").exists()) {
-        return "${projectDir}/../../node_modules/react-native/cli.js"
-    }
-    throw new Exception("Couldn't determine CLI location. " +
-             "Please set `project.ext.react.cliPath` to the path of the react-native cli.js file. This file typically resides in `node_modules/react-native/cli.js`");
-}
-
 def composeSourceMapsPath = config.composeSourceMapsPath ?: "node_modules/react-native/scripts/compose-source-maps.js"
 def bundleAssetName = config.bundleAssetName ?: "index.android.bundle"
 def entryFile = detectEntryFile(config)
@@ -45,6 +32,43 @@ def bundleConfig = config.bundleConfig ? "${reactRoot}/${config.bundleConfig}" :
 def enableVmCleanup = config.enableVmCleanup == null ? true : config.enableVmCleanup
 def hermesCommand = config.hermesCommand ?: "../../node_modules/hermes-engine/%OS-BIN%/hermesc"
 
+/**
+ * Detects CLI location in a similar fashion to the React Native CLI
+ */
+def detectCliPath(config, reactRoot) {
+    // 1. preconfigured path
+    if (config.cliPath) {
+        def cliJsAbsolute = new File(config.cliPath)
+        if (cliJsAbsolute.exists()) {
+            return cliJsAbsolute.getAbsolutePath()
+        }
+        def cliJsRelativeToRoot = new File("${rootDir}/${config.cliPath}")
+        if (cliJsRelativeToRoot.exists()) {
+            return cliJsRelativeToRoot.getAbsolutePath()
+        }
+        def cliJsRelativeToProject = new File("${projectDir}/${config.cliPath}")
+        if (cliJsRelativeToProject.exists()) {
+            return cliJsRelativeToProject.getAbsolutePath()
+        }
+    }
+
+    // 2. node module path
+    def cliJsFromNode = new File(["node", "--print", "require.resolve('react-native/cli').bin"].execute(null, rootDir).text.trim())
+    if (cliJsFromNode.exists()) {
+        return cliJsFromNode.getAbsolutePath()
+    }
+
+    // 3. cli.js in the root folder
+    def rootCliJs = new File(reactRoot, "node_modules/react-native/cli.js")
+    if (rootCliJs.exists()) {
+        return rootCliJs.getAbsolutePath()
+    }
+
+    throw new Exception("Couldn't determine CLI location. " +
+             "Please set `project.ext.react.cliPath` to the path of the react-native cli.js file. " +
+             "This file typically resides in `node_modules/react-native/cli.js`");
+}
+
 def reactNativeDevServerPort() {
     def value = project.getProperties().get("reactNativeDevServerPort")
     return value != null ? value : "8081"
@@ -129,6 +153,19 @@ android {
     }
 }
 
+def jvmVersion = Jvm.current().javaVersion.majorVersion
+if (jvmVersion.toInteger() <= 8) {
+    println "\n\n\n"
+    println "**************************************************************************************************************"
+    println "\n\n"
+    println "ERROR: requires JDK11 or higher."
+    println "Incompatible major version detected: '" + jvmVersion + "'"
+    println "\n\n"
+    println "**************************************************************************************************************"
+    println "\n\n\n"
+    System.exit(1)
+}
+
 afterEvaluate {
     def isAndroidLibrary = plugins.hasPlugin("com.android.library")
     def variants = isAndroidLibrary ? android.libraryVariants : android.applicationVariants
@@ -150,7 +187,7 @@ afterEvaluate {
 
         // Additional node and packager commandline arguments
         def nodeExecutableAndArgs = config.nodeExecutableAndArgs ?: ["node"]
-        def cliPath = detectCliPath(config)
+        def cliPath = detectCliPath(config, reactRoot)
 
         def execCommand = []
 

package/scripts/react_native_pods.rb

@@ -131,10 +131,10 @@ end
 def use_flipper!(versions = {}, configurations: ['Debug'])
   versions['Flipper'] ||= '0.125.0'
   versions['Flipper-Boost-iOSX'] ||= '1.76.0.1.11'
-  versions['Flipper-DoubleConversion'] ||= '3.1.7'
+  versions['Flipper-DoubleConversion'] ||= '3.2.0'
   versions['Flipper-Fmt'] ||= '7.1.7'
   versions['Flipper-Folly'] ||= '2.6.10'
-  versions['Flipper-Glog'] ||= '0.3.9'
+  versions['Flipper-Glog'] ||= '0.5.0.4'
   versions['Flipper-PeerTalk'] ||= '0.0.4'
   versions['Flipper-RSocket'] ||= '1.4.3'
   versions['OpenSSL-Universal'] ||= '1.1.1100'
@@ -176,6 +176,15 @@ def flipper_post_install(installer)
         config.build_settings['SWIFT_VERSION'] = '4.1'
       end
     end
+
+    # Enable flipper for React-Core Debug configuration
+    if target.name == 'React-Core'
+      target.build_configurations.each do |config|
+        if config.name == 'Debug'
+          config.build_settings['OTHER_CFLAGS'] = "$(inherited) -DFB_SONARKIT_ENABLED=1"
+        end
+      end
+    end
   end
 end
 
@@ -271,8 +280,9 @@ def modify_flags_for_new_architecture(installer, cpp_flags)
 end
 
 def build_codegen!(react_native_path)
-  codegen_repo_path = "#{react_native_path}/packages/react-native-codegen";
-  codegen_npm_path = "#{react_native_path}/../react-native-codegen";
+  relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
+  codegen_repo_path = "#{relative_installation_root}/#{react_native_path}/packages/react-native-codegen";
+  codegen_npm_path = "#{relative_installation_root}/#{react_native_path}/../react-native-codegen";
   codegen_cli_path = ""
   if Dir.exist?(codegen_repo_path)
     codegen_cli_path = codegen_repo_path
@@ -313,7 +323,7 @@ def checkAndGenerateEmptyThirdPartyProvider!(react_native_path)
     Pod::Executable.execute_command(
       'node',
       [
-        "#{react_native_path}/scripts/generate-provider-cli.js",
+        "#{relative_installation_root}/#{react_native_path}/scripts/generate-provider-cli.js",
         "--platform", 'ios',
         "--schemaListPath", temp_schema_list_path,
         "--outputDir", "#{output_dir}"
@@ -503,6 +513,7 @@ def use_react_native_codegen_discovery!(options={})
   app_path = options[:app_path]
   fabric_enabled = options[:fabric_enabled] ||= false
   config_file_dir = options[:config_file_dir] ||= ''
+  relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
 
   if !app_path
     Pod::UI.warn '[Codegen] Error: app_path is required for use_react_native_codegen_discovery.'
@@ -518,7 +529,7 @@ def use_react_native_codegen_discovery!(options={})
   out = Pod::Executable.execute_command(
     'node',
     [
-      "#{react_native_path}/scripts/generate-artifacts.js",
+      "#{relative_installation_root}/#{react_native_path}/scripts/generate-artifacts.js",
       "-p", "#{app_path}",
       "-o", Pod::Config.instance.installation_root,
       "-e", "#{fabric_enabled}",
@@ -540,6 +551,7 @@ def use_react_native_codegen!(spec, options={})
   library_name = options[:library_name] ||= "#{spec.name.gsub('_','-').split('-').collect(&:capitalize).join}Spec"
   Pod::UI.puts "[Codegen] Found #{library_name}"
 
+  relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
   output_dir = options[:output_dir] ||= $CODEGEN_OUTPUT_DIR
   output_dir_module = "#{output_dir}/#{$CODEGEN_MODULE_DIR}"
   output_dir_component = "#{output_dir}/#{$CODEGEN_COMPONENT_DIR}"
@@ -547,7 +559,7 @@ def use_react_native_codegen!(spec, options={})
   codegen_config = {
     "modules" => {
       :js_srcs_pattern => "Native*.js",
-      :generated_dir => "#{Pod::Config.instance.installation_root}/#{output_dir_module}/#{library_name}",
+      :generated_dir => "#{relative_installation_root}/#{output_dir_module}/#{library_name}",
       :generated_files => [
         "#{library_name}.h",
         "#{library_name}-generated.mm"
@@ -555,7 +567,7 @@ def use_react_native_codegen!(spec, options={})
     },
     "components" => {
       :js_srcs_pattern => "*NativeComponent.js",
-      :generated_dir => "#{Pod::Config.instance.installation_root}/#{output_dir_component}/#{library_name}",
+      :generated_dir => "#{relative_installation_root}/#{output_dir_component}/#{library_name}",
       :generated_files => [
         "ComponentDescriptors.h",
         "EventEmitters.cpp",
@@ -604,7 +616,7 @@ def use_react_native_codegen!(spec, options={})
   spec.script_phase = {
     :name => 'Generate Specs',
     :input_files => input_files, # This also needs to be relative to Xcode
-    :output_files => ["${DERIVED_FILE_DIR}/codegen-#{library_name}.log"].concat(generated_files.map { |filename| " ${PODS_TARGET_SRCROOT}/#{filename}"} ),
+    :output_files => ["${DERIVED_FILE_DIR}/codegen-#{library_name}.log"].concat(generated_files.map { |filename| "${PODS_TARGET_SRCROOT}/#{filename}"} ),
     # The final generated files will be created when this script is invoked at Xcode build time.
     :script => get_script_phases_no_codegen_discovery(
       react_native_path: react_native_path,

package/template/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     CFPropertyList (3.0.5)
       rexml
-    activesupport (6.1.4.4)
+    activesupport (6.1.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -16,10 +16,10 @@ GEM
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.1.0)
-    cocoapods (1.11.2)
+    cocoapods (1.11.3)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.11.2)
+      cocoapods-core (= 1.11.3)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.4.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -34,7 +34,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (>= 1.0, < 3.0)
       xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.11.2)
+    cocoapods-core (1.11.3)
       activesupport (>= 5.0, < 7)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -45,7 +45,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.5.1)
+    cocoapods-downloader (1.6.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -54,7 +54,7 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     escape (0.0.4)
     ethon (0.15.0)
       ffi (>= 1.15.0)
@@ -63,7 +63,7 @@ GEM
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
-    i18n (1.9.1)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     json (2.6.1)
     minitest (5.15.0)

package/template/_flowconfig

@@ -11,6 +11,8 @@ node_modules/react-native/Libraries/polyfills/.*
 ; Flow doesn't support platforms
 .*/Libraries/Utilities/LoadingView.js
 
+.*/node_modules/resolve/test/resolver/malformed_package_json/package\.json$
+
 [untyped]
 .*/node_modules/@react-native-community/cli/.*/.*
 

package/template/android/app/build.gradle

@@ -186,6 +186,20 @@ android {
             // preBuild.dependsOn("generateCodegenArtifactsFromSchema")
             preDebugBuild.dependsOn(packageReactNdkDebugLibs)
             preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
+
+            // Due to a bug inside AGP, we have to explicitly set a dependency
+            // between configureNdkBuild* tasks and the preBuild tasks.
+            // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732
+            configureNdkBuildRelease.dependsOn(preReleaseBuild)
+            configureNdkBuildDebug.dependsOn(preDebugBuild)
+            reactNativeArchitectures().each { architecture ->
+                tasks.findByName("configureNdkBuildDebug[${architecture}]")?.configure {
+                    dependsOn("preDebugBuild")
+                }
+                tasks.findByName("configureNdkBuildRelease[${architecture}]")?.configure {
+                    dependsOn("preReleaseBuild")
+                }
+            }
         }
     }
 
@@ -238,14 +252,8 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
 
-    // If new architecture is enabled, we let you build RN from source
-    // Otherwise we fallback to a prebuilt .aar bundled in the NPM package.
-    if (isNewArchitectureEnabled()) {
-        implementation project(":ReactAndroid")
-    } else {
-        //noinspection GradleDynamicVersion
-        implementation "com.facebook.react:react-native:+"  // From node_modules
-    }
+    //noinspection GradleDynamicVersion
+    implementation "com.facebook.react:react-native:+"  // From node_modules
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
 
@@ -271,6 +279,18 @@ dependencies {
     }
 }
 
+if (isNewArchitectureEnabled()) {
+    // If new architecture is enabled, we let you build RN from source
+    // Otherwise we fallback to a prebuilt .aar bundled in the NPM package.
+    // This will be applied to all the imported transtitive dependency.
+    configurations.all {
+        resolutionStrategy.dependencySubstitution {
+            substitute(module("com.facebook.react:react-native"))
+                    .using(project(":ReactAndroid")).because("On New Architecture we're building React Native from source")
+        }
+    }
+}
+
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {

package/template/ios/Podfile

@@ -15,8 +15,8 @@ target 'HelloWorld' do
     # to enable hermes on iOS, change `false` to `true` and then install pods
     :hermes_enabled => flags[:hermes_enabled],
     :fabric_enabled => flags[:fabric_enabled],
-    # An abosolute path to your application root.
-    :app_path => "#{Dir.pwd}/.."
+    # An absolute path to your application root.
+    :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
 
   target 'HelloWorldTests' do

package/template/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "17.0.2",
-    "react-native": "0.68.0-rc.1"
+    "react-native": "0.68.0-rc.4"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",
@@ -21,13 +21,9 @@
     "eslint": "^7.32.0",
     "jest": "^26.6.3",
     "metro-react-native-babel-preset": "^0.67.0",
-    "react-native-gradle-plugin": "^0.0.4",
     "react-test-renderer": "17.0.2"
   },
   "jest": {
     "preset": "react-native"
-  },
-  "codegenConfig": {
-    "libraries": []
   }
 }

package/third-party-podspecs/RCT-Folly.podspec

@@ -91,7 +91,11 @@ Pod::Spec.new do |spec|
                           'folly/concurrency/CacheLocality.cpp',
                           'folly/detail/Futex.cpp',
                           'folly/synchronization/ParkingLot.cpp',
-                          'folly/portability/Malloc.cpp'
+                          'folly/portability/Malloc.cpp',
+                          'folly/concurrency/CacheLocality.h',
+                          'folly/synchronization/ParkingLot.h',
+                          'folly/synchronization/SanitizeThread.h',
+                          'folly/system/ThreadId.h'
 
     fabric.preserve_paths = 'folly/concurrency/CacheLocality.h',
                             'folly/synchronization/ParkingLot.h',

package/android/com/facebook/react/react-native/0.68.0-rc.1/react-native-0.68.0-rc.1-sources.jar.md5

@@ -1 +0,0 @@
-f107b502b317141f71690d14c468a92a

package/android/com/facebook/react/react-native/0.68.0-rc.1/react-native-0.68.0-rc.1-sources.jar.sha1

@@ -1 +0,0 @@
-35b5dcb1b636cb471770dd4d06d1ed2bd1c434af

package/android/com/facebook/react/react-native/0.68.0-rc.1/react-native-0.68.0-rc.1-sources.jar.sha256

@@ -1 +0,0 @@
-613636cf61676a572ea38f4600557d16ce59fe09fc7c7b12d4007b0e7eaaff51

package/android/com/facebook/react/react-native/0.68.0-rc.1/react-native-0.68.0-rc.1-sources.jar.sha512

@@ -1 +0,0 @@
-6f4da966cc26a8cb950b05598eeb63fc493137129392812c7ce57e52bf72d77ab8b5a8cd397d6e7c976384511a452b96a40c9347eda8d090126cc6ba03e02dbe

package/android/com/facebook/react/react-native/0.68.0-rc.1/react-native-0.68.0-rc.1.aar.md5

@@ -1 +0,0 @@
-52df61c91e6e1dc484b6f7041da9ce3e

package/android/com/facebook/react/react-native/0.68.0-rc.1/react-native-0.68.0-rc.1.aar.sha1

@@ -1 +0,0 @@
-115c2ad91875cab758d40483cfb0aba6c6eff212

package/android/com/facebook/react/react-native/0.68.0-rc.1/react-native-0.68.0-rc.1.aar.sha256

@@ -1 +0,0 @@
-6073f03f09bda95a8b83931de5e7f046bda458296fa3c9760454205c2e353957

package/android/com/facebook/react/react-native/0.68.0-rc.1/react-native-0.68.0-rc.1.aar.sha512

@@ -1 +0,0 @@
-2959cdc03a904f7f6845c88d017432592a04c96283018287625735536ea92cef4fe29393809c5b7e63fdb13097c4b8fbaf4ea22c4cfab99a1a9dc13bedd62d8f

package/android/com/facebook/react/react-native/0.68.0-rc.1/react-native-0.68.0-rc.1.module.md5

@@ -1 +0,0 @@
-777c7047b7677c1321b16d104af11646

package/android/com/facebook/react/react-native/0.68.0-rc.1/react-native-0.68.0-rc.1.module.sha1

@@ -1 +0,0 @@
-6886c8f743c45d55423cbbeb0fe8ac9481894768

package/android/com/facebook/react/react-native/0.68.0-rc.1/react-native-0.68.0-rc.1.module.sha256

@@ -1 +0,0 @@
-a5d9376d767535ebc2afe1835a1b66a96c4a828b3667025274dca6bf59ca1f7b

package/android/com/facebook/react/react-native/0.68.0-rc.1/react-native-0.68.0-rc.1.module.sha512

@@ -1 +0,0 @@
-52eead21d799a29f90910b18862812c65e19f8846f9595b1451cbd364ba6ea6ea9f353ad18a58f63980e8842c06a7c29c169c78e6fddd573969fb7c3eeca5a3e

package/android/com/facebook/react/react-native/0.68.0-rc.1/react-native-0.68.0-rc.1.pom.md5

@@ -1 +0,0 @@
-0fa24512d15617b0f6065614e9ec6c45

package/android/com/facebook/react/react-native/0.68.0-rc.1/react-native-0.68.0-rc.1.pom.sha1

@@ -1 +0,0 @@
-9660bcfd32f296822be3412c92337da5dc69d391

package/android/com/facebook/react/react-native/0.68.0-rc.1/react-native-0.68.0-rc.1.pom.sha256

@@ -1 +0,0 @@
-f3e5f7d4e0627270eeaa82f3259a719b056424a7f94131b7982b3e3fba43718c

package/android/com/facebook/react/react-native/0.68.0-rc.1/react-native-0.68.0-rc.1.pom.sha512

@@ -1 +0,0 @@
-f5cb731868236d2fab67bfe79ae21bafd97fdc0f822a3ac52d1c9d207a4087f75a39c58892c6f960e1b61f8910a00733abe90e0afebae600685b7e445b5289a2