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

package/Libraries/Core/ReactNativeVersion.js

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

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/React/Base/RCTVersion.m

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

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/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.2
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative

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.2");
 }

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/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.2";
 } 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.2/react-native-0.68.0-rc.2-sources.jar.md5

@@ -0,0 +1 @@
+066ff5221f935f8b862610c4673f00a4

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

@@ -0,0 +1 @@
+ae2bec5e1bf5eda6ab21a6bcbdcf2102a70c5a25

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

@@ -0,0 +1 @@
+c096d1d793f4ea26a5d447a3c08c0d270b4d0eb5b3dc6cf7ef109c5b1b8d1288

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

@@ -0,0 +1 @@
+00ae26c7d0c06f960b2ba7bdc5e7942390b586ce0337c67dd1d08d4d243288db4730aa95b7551c174360674eeb4663d719a05cee0ececb6ee17d51260e22d17b

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

@@ -0,0 +1 @@
+360a029ccfcc97c4802d2b2fdf34f2be

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

@@ -0,0 +1 @@
+500aa4ef242ba6f16ad72eb869b52b3bf0f4b1fc

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

@@ -0,0 +1 @@
+e13bab7272f37036164179df6938995ef22619f6bfb7bbb1abb9214bb19ac423

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

@@ -0,0 +1 @@
+d65d387d3b6e7652c96dd9f1f190e7643db811dbe90aa1d6fe143e50429854fe0d17e6672a2584e1b18fecbbb18727bf1abe0cfd5865f9b4c8213dc6a0f59447

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

@@ -3,7 +3,7 @@
   "component": {
     "group": "com.facebook.react",
     "module": "react-native",
-    "version": "0.68.0-rc.1",
+    "version": "0.68.0-rc.2",
     "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.2.aar",
+          "url": "react-native-0.68.0-rc.2.aar",
+          "size": 16395396,
+          "sha512": "d65d387d3b6e7652c96dd9f1f190e7643db811dbe90aa1d6fe143e50429854fe0d17e6672a2584e1b18fecbbb18727bf1abe0cfd5865f9b4c8213dc6a0f59447",
+          "sha256": "e13bab7272f37036164179df6938995ef22619f6bfb7bbb1abb9214bb19ac423",
+          "sha1": "500aa4ef242ba6f16ad72eb869b52b3bf0f4b1fc",
+          "md5": "360a029ccfcc97c4802d2b2fdf34f2be"
         }
       ]
     },
@@ -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.2.aar",
+          "url": "react-native-0.68.0-rc.2.aar",
+          "size": 16395396,
+          "sha512": "d65d387d3b6e7652c96dd9f1f190e7643db811dbe90aa1d6fe143e50429854fe0d17e6672a2584e1b18fecbbb18727bf1abe0cfd5865f9b4c8213dc6a0f59447",
+          "sha256": "e13bab7272f37036164179df6938995ef22619f6bfb7bbb1abb9214bb19ac423",
+          "sha1": "500aa4ef242ba6f16ad72eb869b52b3bf0f4b1fc",
+          "md5": "360a029ccfcc97c4802d2b2fdf34f2be"
         }
       ]
     }

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

@@ -0,0 +1 @@
+297d9aadca9bbcb5e38eaee90802c592

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

@@ -0,0 +1 @@
+1a4a5b5dc0461e88fe31aa85a8bbea18f80c535a

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

@@ -0,0 +1 @@
+2a535b5797f1c56703cef6c9ef54f0e435e2a4bb0364f5856e82d758adfab7fe

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

@@ -0,0 +1 @@
+6e57c57369e5d91f713251c6518c4544d6affc2e7b04edb719deea0d709eb6837c8d0b07d8e769dcf58d0b86662b73446539dda916077c5b2bd2156617adf645

package/android/com/facebook/react/react-native/{0.68.0-rc.1/react-native-0.68.0-rc.1.pom → 0.68.0-rc.2/react-native-0.68.0-rc.2.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.2</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.2/react-native-0.68.0-rc.2.pom.md5

@@ -0,0 +1 @@
+1cac927d6fc0fc5d35925d920385f068

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

@@ -0,0 +1 @@
+081b8d301dcfe2c58d3322dea142fc39f2529252

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

@@ -0,0 +1 @@
+0cf47303bbf93075c28dfd284b652b43e722d02160dc68889a3fca2ca3d8098d

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

@@ -0,0 +1 @@
+08995052484f3ac0d8c386a974d2179a055a941bf4f9200cf4c5bade07428db63c1232815dbaed23399770be34c5d8b9960eae294a3b496875441edc8b99a14b

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.2</latest>
+    <release>0.68.0-rc.2</release>
     <versions>
-      <version>0.68.0-rc.1</version>
+      <version>0.68.0-rc.2</version>
     </versions>
-    <lastUpdated>20220203174340</lastUpdated>
+    <lastUpdated>20220224173052</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-aa457a3e7ea2c6e4f0b8f6a08958c8ff
+3b19734776929fa5018cb9ea29a72206

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

@@ -1 +1 @@
-5ceb80dd1d92fcdf0d07bdd822f5ba9f539eb7ef
+df094a38c2f4a6287fc6fbe38b0f295d596f22f3

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

@@ -1 +1 @@
-0bd0710cd56264137900969f9ed30ea4c4f8a18eee068844a9fa3843e11b03b6
+5de8853cc407555e54e74f3bacfa5c26f34adab6d5b480e2da7e109405fc6227

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

@@ -1 +1 @@
-70ade999243740c2e1f9494292a1aa855813555ff0b8428f638b13771d32ed6c6b842993f0d970498d5427b04f18ba9a956e9f73bffe979703ddbd3a11696f34
+fa850e13d54b106ce4f6c32cd08493f703f3e231a264079e5f2dbf307229c49a39d03bd1f252770c9db1a34c4db625e180ee0f10c842036bcec50bd15ff41a38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.68.0-rc.1",
+  "version": "0.68.0-rc.2",
   "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 : [:];
 
@@ -129,6 +130,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

package/template/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     CFPropertyList (3.0.5)
       rexml
-    activesupport (6.1.4.4)
+    activesupport (6.1.4.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -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

@@ -238,14 +238,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 +265,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/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "17.0.2",
-    "react-native": "0.68.0-rc.1"
+    "react-native": "0.68.0-rc.2"
   },
   "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/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