react-native 0.68.0-rc.2 → 0.68.0

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.2',
+  prerelease: null,
 };

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/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.2",
+                  RCTVersionPrerelease: [NSNull null],
                   };
   });
   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/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/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.68.0-rc.2
+VERSION_NAME=0.68.0
 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.2");
+      "prerelease", null);
 }

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.2";
+  std::string_view Prerelease = "";
 } ReactNativeVersion;
 
 } // namespace facebook::react

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

@@ -0,0 +1 @@
+f55f14f3cb63996d8926c0c50b31ca7e

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

@@ -0,0 +1 @@
+f1157badf388f789f013ef88ff83fec36d107879

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

@@ -0,0 +1 @@
+08b0a2af4acb5cf0d3ab072ab97678cce5c737be4abe1d789106e79a634a4a78

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

@@ -0,0 +1 @@
+c5ff3d246480499c0cb9046e14a282e5a65096c0e142afd59285c5f2774538736d2b471b25b766adf13cf9195aa321757bc7062041d6c7cc5b755e5d28d84114

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

@@ -0,0 +1 @@
+2f6d18f351a74956794b0b63beb654bd

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

@@ -0,0 +1 @@
+25f59181482778ded26dd92dfd48a09a862ce517

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

@@ -0,0 +1 @@
+046ffa8f0429c2162c3394bda1d48504b40d5f2edec64ff0e8f40d165c15fdc8

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

@@ -0,0 +1 @@
+9d2f4f291d6ea65ff4a58f45f513d4304c3103c6c37cbdce8106bb6570d75fe86e690a20cab5b156882725e3e05682efbd8b5cf6f1457eaae8c649256fbba292

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

@@ -3,7 +3,7 @@
   "component": {
     "group": "com.facebook.react",
     "module": "react-native",
-    "version": "0.68.0-rc.2",
+    "version": "0.68.0",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -131,13 +131,13 @@
       ],
       "files": [
         {
-          "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"
+          "name": "react-native-0.68.0.aar",
+          "url": "react-native-0.68.0.aar",
+          "size": 16395214,
+          "sha512": "9d2f4f291d6ea65ff4a58f45f513d4304c3103c6c37cbdce8106bb6570d75fe86e690a20cab5b156882725e3e05682efbd8b5cf6f1457eaae8c649256fbba292",
+          "sha256": "046ffa8f0429c2162c3394bda1d48504b40d5f2edec64ff0e8f40d165c15fdc8",
+          "sha1": "25f59181482778ded26dd92dfd48a09a862ce517",
+          "md5": "2f6d18f351a74956794b0b63beb654bd"
         }
       ]
     },
@@ -258,13 +258,13 @@
       ],
       "files": [
         {
-          "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"
+          "name": "react-native-0.68.0.aar",
+          "url": "react-native-0.68.0.aar",
+          "size": 16395214,
+          "sha512": "9d2f4f291d6ea65ff4a58f45f513d4304c3103c6c37cbdce8106bb6570d75fe86e690a20cab5b156882725e3e05682efbd8b5cf6f1457eaae8c649256fbba292",
+          "sha256": "046ffa8f0429c2162c3394bda1d48504b40d5f2edec64ff0e8f40d165c15fdc8",
+          "sha1": "25f59181482778ded26dd92dfd48a09a862ce517",
+          "md5": "2f6d18f351a74956794b0b63beb654bd"
         }
       ]
     }

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

@@ -0,0 +1 @@
+fce6f3ceed3118cb39b58f928fdb309b

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

@@ -0,0 +1 @@
+087308dfec1d3631a325de0f4c8c23acaae49f99

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

@@ -0,0 +1 @@
+b3ff73e4c796c20574945d59b08a660d2a88f4dca0a413d1759bdfcfb78124c3

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

@@ -0,0 +1 @@
+44ef2181904ef6cca1185b2faa667d8597dc46dc0913520f4009d5706c5a4988f5cd08d9c824df1319738924543d9ccfa3bb41da105e85eccd80a46b02b9f960

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

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
-  <version>0.68.0-rc.2</version>
+  <version>0.68.0</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/react-native-0.68.0.pom.md5

@@ -0,0 +1 @@
+9348643a6ce425618d88eff074bcaf7d

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

@@ -0,0 +1 @@
+92d1831034da7be880a07c0aff21f52dc4946651

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

@@ -0,0 +1 @@
+0c40aa19de1ba78a4df4ea9b327a6844f925e75e99efa9eff3460201012955e5

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

@@ -0,0 +1 @@
+824bab0661fc5c82682dc478803dd697568824cd1436ac3af04dff98c2cf1c78e480ad048cdb966a6c00ef8f5fffc16c252792b6509660522c42ef669c207df8

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

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

@@ -1 +1 @@
-3b19734776929fa5018cb9ea29a72206
+64d75baf42f1c48e46f54b96023e9475

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

@@ -1 +1 @@
-df094a38c2f4a6287fc6fbe38b0f295d596f22f3
+1bfb56a90540f8b56249136b3a228a47f2aff51a

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

@@ -1 +1 @@
-5de8853cc407555e54e74f3bacfa5c26f34adab6d5b480e2da7e109405fc6227
+26caf0e0e938f96fac4e91f519b55f03fccc5405150ce29513330e0b9f3fc4e5

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

@@ -1 +1 @@
-fa850e13d54b106ce4f6c32cd08493f703f3e231a264079e5f2dbf307229c49a39d03bd1f252770c9db1a34c4db625e180ee0f10c842036bcec50bd15ff41a38
+8d2bc7651f9dde50733c00da2c4b855f89750f5c7fa08f9089b0b3b00077568ab02219d8eb5dd483322ae694bf779460a08f0da787a08f31f8c83af67f2b46e0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.68.0-rc.2",
+  "version": "0.68.0",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",

package/react.gradle

@@ -22,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)
@@ -46,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"
@@ -164,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.6)
+    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.2)
     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)

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")
+                }
+            }
         }
     }
 

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.2"
+    "react-native": "0.68.0"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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