react-native 0.63.3 → 0.63.5

package/Libraries/Components/ScrollView/AndroidHorizontalScrollViewNativeComponent.js

@@ -37,6 +37,7 @@ const AndroidHorizontalScrollViewViewConfig = {
     snapToInterval: true,
     snapToStart: true,
     snapToOffsets: true,
+    contentOffset: true,
   },
 };
 

package/Libraries/Core/ReactNativeVersion.js

@@ -12,6 +12,6 @@
 exports.version = {
   major: 0,
   minor: 63,
-  patch: 3,
+  patch: 5,
   prerelease: null,
 };

package/Libraries/Utilities/MatrixMath.js

@@ -651,10 +651,6 @@ const MatrixMath = {
     skew[0] = MatrixMath.v3Dot(row[0], row[1]);
     row[1] = MatrixMath.v3Combine(row[1], row[0], 1.0, -skew[0]);
 
-    // Compute XY shear factor and make 2nd row orthogonal to 1st.
-    skew[0] = MatrixMath.v3Dot(row[0], row[1]);
-    row[1] = MatrixMath.v3Combine(row[1], row[0], 1.0, -skew[0]);
-
     // Now, compute Y scale and normalize 2nd row.
     scale[1] = MatrixMath.v3Length(row[1]);
     row[1] = MatrixMath.v3Normalize(row[1], scale[1]);

package/React/Base/RCTVersion.m

@@ -23,7 +23,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(63),
-                  RCTVersionPatch: @(3),
+                  RCTVersionPatch: @(5),
                   RCTVersionPrerelease: [NSNull null],
                   };
   });

package/React/CoreModules/RCTAlertController.h

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface RCTAlertController : UIAlertController
+
+- (void)show:(BOOL)animated completion:(void (^)(void))completion;
+
+@end

package/React/CoreModules/RCTAlertController.m

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTUtils.h>
+
+#import "RCTAlertController.h"
+
+@interface RCTAlertController ()
+
+@property (nonatomic, strong) UIWindow *alertWindow;
+
+@end
+
+@implementation RCTAlertController
+
+- (UIWindow *)alertWindow
+{
+  if (_alertWindow == nil) {
+    _alertWindow = [[UIWindow alloc] initWithFrame:RCTSharedApplication().keyWindow.bounds];
+    _alertWindow.rootViewController = [UIViewController new];
+    _alertWindow.windowLevel = UIWindowLevelAlert + 1;
+  }
+  return _alertWindow;
+}
+
+- (void)show:(BOOL)animated completion:(void (^)(void))completion
+{
+  [self.alertWindow makeKeyAndVisible];
+  [self.alertWindow.rootViewController presentViewController:self animated:animated completion:completion];
+}
+
+@end

package/React/CoreModules/RCTAlertManager.mm

@@ -15,6 +15,7 @@
 #import <React/RCTUtils.h>
 
 #import "CoreModulesPlugins.h"
+#import "RCTAlertController.h"
 
 @implementation RCTConvert (UIAlertViewStyle)
 
@@ -99,29 +100,9 @@ RCT_EXPORT_METHOD(alertWithArgs : (JS::NativeAlertManager::Args &)args callback
     }
   }
 
-  UIViewController *presentingController = RCTPresentedViewController();
-  if (presentingController == nil) {
-    RCTLogError(@"Tried to display alert view but there is no application window. args: %@", @{
-      @"title" : args.title() ?: [NSNull null],
-      @"message" : args.message() ?: [NSNull null],
-      @"buttons" : RCTConvertOptionalVecToArray(
-          args.buttons(),
-          ^id(id<NSObject> element) {
-            return element;
-          })
-          ?: [NSNull null],
-      @"type" : args.type() ?: [NSNull null],
-      @"defaultValue" : args.defaultValue() ?: [NSNull null],
-      @"cancelButtonKey" : args.cancelButtonKey() ?: [NSNull null],
-      @"destructiveButtonKey" : args.destructiveButtonKey() ?: [NSNull null],
-      @"keyboardType" : args.keyboardType() ?: [NSNull null],
-    });
-    return;
-  }
-
-  UIAlertController *alertController = [UIAlertController alertControllerWithTitle:title
-                                                                           message:nil
-                                                                    preferredStyle:UIAlertControllerStyleAlert];
+  RCTAlertController *alertController = [RCTAlertController alertControllerWithTitle:title
+                                                                             message:nil
+                                                                      preferredStyle:UIAlertControllerStyleAlert];
   switch (type) {
     case RCTAlertViewStylePlainTextInput: {
       [alertController addTextFieldWithConfigurationHandler:^(UITextField *textField) {
@@ -170,7 +151,7 @@ RCT_EXPORT_METHOD(alertWithArgs : (JS::NativeAlertManager::Args &)args callback
     } else if ([buttonKey isEqualToString:destructiveButtonKey]) {
       buttonStyle = UIAlertActionStyleDestructive;
     }
-    __weak UIAlertController *weakAlertController = alertController;
+    __weak RCTAlertController *weakAlertController = alertController;
     [alertController
         addAction:[UIAlertAction
                       actionWithTitle:buttonTitle
@@ -202,7 +183,7 @@ RCT_EXPORT_METHOD(alertWithArgs : (JS::NativeAlertManager::Args &)args callback
   [_alertControllers addObject:alertController];
 
   dispatch_async(dispatch_get_main_queue(), ^{
-    [presentingController presentViewController:alertController animated:YES completion:nil];
+    [alertController show:YES completion:nil];
   });
 }
 

package/React/CoreModules/RCTWebSocketModule.mm

@@ -166,7 +166,9 @@ RCT_EXPORT_METHOD(close : (double)code reason : (NSString *)reason socketID : (d
   NSNumber *socketID = [webSocket reactTag];
   _contentHandlers[socketID] = nil;
   _sockets[socketID] = nil;
-  [self sendEventWithName:@"websocketFailed" body:@{@"message" : error.localizedDescription, @"id" : socketID}];
+  NSDictionary *body =
+      @{@"message" : error.localizedDescription ?: @"Undefined, error is nil", @"id" : socketID ?: @(-1)};
+  [self sendEventWithName:@"websocketFailed" body:body];
 }
 
 - (void)webSocket:(RCTSRWebSocket *)webSocket

package/React/Views/RCTConvert+Transform.m

@@ -65,6 +65,7 @@ static const NSUInteger kMatrixArrayLength = 4 * 4;
 
   CGFloat zeroScaleThreshold = FLT_EPSILON;
 
+  CATransform3D next;
   for (NSDictionary *transformConfig in (NSArray<NSDictionary *> *)json) {
     if (transformConfig.count != 1) {
       RCTLogConvertError(json, @"a CATransform3D. You must specify exactly one property per transform object.");
@@ -74,10 +75,13 @@ static const NSUInteger kMatrixArrayLength = 4 * 4;
     id value = transformConfig[property];
 
     if ([property isEqualToString:@"matrix"]) {
-      transform = [self CATransform3DFromMatrix:value];
+      next = [self CATransform3DFromMatrix:value];
+      transform = CATransform3DConcat(next, transform);
 
     } else if ([property isEqualToString:@"perspective"]) {
-      transform.m34 = -1 / [value floatValue];
+      next = CATransform3DIdentity;
+      next.m34 = -1 / [value floatValue];
+      transform = CATransform3DConcat(next, transform);
 
     } else if ([property isEqualToString:@"rotateX"]) {
       CGFloat rotate = [self convertToRadians:value];
@@ -123,11 +127,15 @@ static const NSUInteger kMatrixArrayLength = 4 * 4;
 
     } else if ([property isEqualToString:@"skewX"]) {
       CGFloat skew = [self convertToRadians:value];
-      transform.m21 = tanf(skew);
+      next = CATransform3DIdentity;
+      next.m21 = tanf(skew);
+      transform = CATransform3DConcat(next, transform);
 
     } else if ([property isEqualToString:@"skewY"]) {
       CGFloat skew = [self convertToRadians:value];
-      transform.m12 = tanf(skew);
+      next = CATransform3DIdentity;
+      next.m12 = tanf(skew);
+      transform = CATransform3DConcat(next, transform);
 
     } else {
       RCTLogError(@"Unsupported transform type for a CATransform3D: %@.", property);

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.63.3
+VERSION_NAME=0.63.5
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative
@@ -13,8 +13,8 @@ FEST_ASSERT_CORE_VERSION=2.0M10
 
 ANDROIDX_TEST_VERSION=1.1.0
 FRESCO_VERSION=2.0.0
-OKHTTP_VERSION=3.12.1
-SO_LOADER_VERSION=0.8.2
+OKHTTP_VERSION=3.12.12
+SO_LOADER_VERSION=0.9.0
 
 BOOST_VERSION=1_63_0
 DOUBLE_CONVERSION_VERSION=1.1.6

package/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java

@@ -705,6 +705,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
         return;
       }
       mDeviceRotation = rotation;
+      DisplayMetricsHolder.initDisplayMetrics(getContext().getApplicationContext());
       emitOrientationChanged(rotation);
     }
 

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java

@@ -120,7 +120,7 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
     if (hasKey(name)) {
       return getLocalMap().get(name);
     }
-    throw new NoSuchKeyException(name);
+    return null;
   }
 
   private @Nullable <T> T getNullableValue(String name, Class<T> type) {

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

@@ -17,6 +17,6 @@ public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
       "minor", 63,
-      "patch", 3,
+      "patch", 5,
       "prerelease", null);
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/MatrixMathHelper.java

@@ -169,10 +169,6 @@ public class MatrixMathHelper {
     skew[0] = v3Dot(row[0], row[1]);
     row[1] = v3Combine(row[1], row[0], 1.0, -skew[0]);
 
-    // Compute XY shear factor and make 2nd row orthogonal to 1st.
-    skew[0] = v3Dot(row[0], row[1]);
-    row[1] = v3Combine(row[1], row[0], 1.0, -skew[0]);
-
     // Now, compute Y scale and normalize 2nd row.
     scale[1] = v3Length(row[1]);
     row[1] = v3Normalize(row[1], scale[1]);

package/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDropdownPickerManagerDelegate.java

@@ -1,12 +1,11 @@
 /**
-* Copyright (c) Facebook, Inc. and its affiliates.
-*
-* This source code is licensed under the MIT license found in the
-* LICENSE file in the root directory of this source tree.
-*
-* @generated by codegen project: GeneratePropsJavaDelegate.js
-*/
-
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
+ * directory of this source tree.
+ *
+ * @generated by codegen project: GeneratePropsJavaDelegate.js
+ */
 package com.facebook.react.viewmanagers;
 
 import android.view.View;
@@ -16,10 +15,14 @@ import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
 import com.facebook.react.uimanager.LayoutShadowNode;
 
-public class AndroidDropdownPickerManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & AndroidDropdownPickerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class AndroidDropdownPickerManagerDelegate<
+        T extends View,
+        U extends BaseViewManagerInterface<T> & AndroidDropdownPickerManagerInterface<T>>
+    extends BaseViewManagerDelegate<T, U> {
   public AndroidDropdownPickerManagerDelegate(U viewManager) {
     super(viewManager);
   }
+
   @Override
   public void setProperty(T view, String propName, @Nullable Object value) {
     switch (propName) {

package/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java

@@ -8,6 +8,7 @@
 package com.facebook.react.views.picker;
 
 import android.widget.Spinner;
+import androidx.annotation.NonNull;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewManagerDelegate;
@@ -41,4 +42,9 @@ public class ReactDropdownPickerManager extends ReactPickerManager
   protected ViewManagerDelegate<ReactPicker> getDelegate() {
     return mDelegate;
   }
+
+  @Override
+  public void setBackgroundColor(@NonNull ReactPicker view, int backgroundColor) {
+    view.setStagedBackgroundColor(backgroundColor);
+  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java

@@ -8,12 +8,14 @@
 package com.facebook.react.views.picker;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.Spinner;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatSpinner;
+import androidx.core.view.ViewCompat;
 import com.facebook.react.common.annotations.VisibleForTesting;
 import java.util.List;
 
@@ -173,6 +175,7 @@ public class ReactPicker extends AppCompatSpinner {
         && adapter != null
         && mStagedPrimaryTextColor != adapter.getPrimaryTextColor()) {
       adapter.setPrimaryTextColor(mStagedPrimaryTextColor);
+      ViewCompat.setBackgroundTintList(this, ColorStateList.valueOf(mStagedPrimaryTextColor));
       mStagedPrimaryTextColor = null;
     }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java

@@ -50,6 +50,8 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
   private static final String CONTENT_OFFSET_LEFT = "contentOffsetLeft";
   private static final String CONTENT_OFFSET_TOP = "contentOffsetTop";
 
+  private static final int UNSET_CONTENT_OFFSET = -1;
+
   private final OnScrollDispatchHelper mOnScrollDispatchHelper = new OnScrollDispatchHelper();
   private final @Nullable OverScroller mScroller;
   private final VelocityHelper mVelocityHelper = new VelocityHelper();
@@ -76,6 +78,8 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
   private boolean mSnapToEnd = true;
   private ReactViewBackgroundManager mReactBackgroundManager;
   private boolean mPagedArrowScrolling = false;
+  private int pendingContentOffsetX = UNSET_CONTENT_OFFSET;
+  private int pendingContentOffsetY = UNSET_CONTENT_OFFSET;
   private @Nullable StateWrapper mStateWrapper;
 
   private final Rect mTempRect = new Rect();
@@ -224,7 +228,13 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
   @Override
   protected void onLayout(boolean changed, int l, int t, int r, int b) {
     // Call with the present values in order to re-layout if necessary
-    reactScrollTo(getScrollX(), getScrollY());
+    // If a "pending" value has been set, we restore that value.
+    // That value gets cleared by reactScrollTo.
+    int scrollToX =
+        pendingContentOffsetX != UNSET_CONTENT_OFFSET ? pendingContentOffsetX : getScrollX();
+    int scrollToY =
+        pendingContentOffsetY != UNSET_CONTENT_OFFSET ? pendingContentOffsetY : getScrollY();
+    reactScrollTo(scrollToX, scrollToY);
   }
 
   /**
@@ -906,6 +916,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
   public void reactSmoothScrollTo(int x, int y) {
     smoothScrollTo(x, y);
     updateStateOnScroll(x, y);
+    setPendingContentOffsets(x, y);
   }
 
   /**
@@ -917,6 +928,25 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
   public void reactScrollTo(int x, int y) {
     scrollTo(x, y);
     updateStateOnScroll(x, y);
+    setPendingContentOffsets(x, y);
+  }
+
+  /**
+   * If contentOffset is set before the View has been laid out, store the values and set them when
+   * `onLayout` is called.
+   *
+   * @param x
+   * @param y
+   */
+  private void setPendingContentOffsets(int x, int y) {
+    View child = getChildAt(0);
+    if (child != null && child.getWidth() != 0 && child.getHeight() != 0) {
+      pendingContentOffsetX = UNSET_CONTENT_OFFSET;
+      pendingContentOffsetY = UNSET_CONTENT_OFFSET;
+    } else {
+      pendingContentOffsetX = x;
+      pendingContentOffsetY = y;
+    }
   }
 
   public void updateState(@Nullable StateWrapper stateWrapper) {

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java

@@ -12,6 +12,7 @@ import android.util.DisplayMetrics;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.DisplayMetricsHolder;
 import com.facebook.react.uimanager.PixelUtil;
@@ -299,4 +300,15 @@ public class ReactHorizontalScrollViewManager extends ViewGroupManager<ReactHori
       view.setFadingEdgeLength(0);
     }
   }
+
+  @ReactProp(name = "contentOffset")
+  public void setContentOffset(ReactHorizontalScrollView view, ReadableMap value) {
+    if (value != null) {
+      double x = value.hasKey("x") ? value.getDouble("x") : 0;
+      double y = value.hasKey("y") ? value.getDouble("y") : 0;
+      view.reactScrollTo((int) PixelUtil.toPixelFromDIP(x), (int) PixelUtil.toPixelFromDIP(y));
+    } else {
+      view.reactScrollTo(0, 0);
+    }
+  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java

@@ -55,6 +55,8 @@ public class ReactScrollView extends ScrollView
   private static final String CONTENT_OFFSET_LEFT = "contentOffsetLeft";
   private static final String CONTENT_OFFSET_TOP = "contentOffsetTop";
 
+  private static final int UNSET_CONTENT_OFFSET = -1;
+
   private final OnScrollDispatchHelper mOnScrollDispatchHelper = new OnScrollDispatchHelper();
   private final @Nullable OverScroller mScroller;
   private final VelocityHelper mVelocityHelper = new VelocityHelper();
@@ -81,6 +83,8 @@ public class ReactScrollView extends ScrollView
   private boolean mSnapToEnd = true;
   private View mContentView;
   private ReactViewBackgroundManager mReactBackgroundManager;
+  private int pendingContentOffsetX = UNSET_CONTENT_OFFSET;
+  private int pendingContentOffsetY = UNSET_CONTENT_OFFSET;
   private @Nullable StateWrapper mStateWrapper;
 
   public ReactScrollView(ReactContext context) {
@@ -200,7 +204,13 @@ public class ReactScrollView extends ScrollView
   @Override
   protected void onLayout(boolean changed, int l, int t, int r, int b) {
     // Call with the present values in order to re-layout if necessary
-    reactScrollTo(getScrollX(), getScrollY());
+    // If a "pending" value has been set, we restore that value.
+    // That value gets cleared by reactScrollTo.
+    int scrollToX =
+        pendingContentOffsetX != UNSET_CONTENT_OFFSET ? pendingContentOffsetX : getScrollX();
+    int scrollToY =
+        pendingContentOffsetY != UNSET_CONTENT_OFFSET ? pendingContentOffsetY : getScrollY();
+    reactScrollTo(scrollToX, scrollToY);
   }
 
   @Override
@@ -777,6 +787,7 @@ public class ReactScrollView extends ScrollView
   public void reactSmoothScrollTo(int x, int y) {
     smoothScrollTo(x, y);
     updateStateOnScroll(x, y);
+    setPendingContentOffsets(x, y);
   }
 
   /**
@@ -788,6 +799,25 @@ public class ReactScrollView extends ScrollView
   public void reactScrollTo(int x, int y) {
     scrollTo(x, y);
     updateStateOnScroll(x, y);
+    setPendingContentOffsets(x, y);
+  }
+
+  /**
+   * If contentOffset is set before the View has been laid out, store the values and set them when
+   * `onLayout` is called.
+   *
+   * @param x
+   * @param y
+   */
+  private void setPendingContentOffsets(int x, int y) {
+    View child = getChildAt(0);
+    if (child != null && child.getWidth() != 0 && child.getHeight() != 0) {
+      pendingContentOffsetX = UNSET_CONTENT_OFFSET;
+      pendingContentOffsetY = UNSET_CONTENT_OFFSET;
+    } else {
+      pendingContentOffsetX = x;
+      pendingContentOffsetY = y;
+    }
   }
 
   /**

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java

@@ -13,6 +13,7 @@ import android.view.View;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.RetryableMountingLayerException;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.module.annotations.ReactModule;
@@ -304,6 +305,17 @@ public class ReactScrollViewManager extends ViewGroupManager<ReactScrollView>
     }
   }
 
+  @ReactProp(name = "contentOffset")
+  public void setContentOffset(ReactScrollView view, ReadableMap value) {
+    if (value != null) {
+      double x = value.hasKey("x") ? value.getDouble("x") : 0;
+      double y = value.hasKey("y") ? value.getDouble("y") : 0;
+      view.reactScrollTo((int) PixelUtil.toPixelFromDIP(x), (int) PixelUtil.toPixelFromDIP(y));
+    } else {
+      view.reactScrollTo(0, 0);
+    }
+  }
+
   @Override
   public Object updateState(
       ReactScrollView view, ReactStylesDiffMap props, @Nullable StateWrapper stateWrapper) {

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

@@ -383,8 +383,6 @@ public class ReactEditText extends AppCompatEditText {
   @Override
   public void setInputType(int type) {
     Typeface tf = super.getTypeface();
-    // Input type password defaults to monospace font, so we need to re-apply the font
-    super.setTypeface(tf);
 
     int inputType = type;
 
@@ -401,6 +399,8 @@ public class ReactEditText extends AppCompatEditText {
 
     super.setInputType(inputType);
     mStagedInputType = inputType;
+    // Input type password defaults to monospace font, so we need to re-apply the font
+    super.setTypeface(tf);
 
     /**
      * If set forces multiline on input, because of a restriction on Android source that enables

package/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK

@@ -10,9 +10,9 @@ fb_native.android_library(
     visibility = ["PUBLIC"],
 )
 
-fb_native.android_prebuilt_aar(
+fb_native.prebuilt_jar(
     name = "annotation-binary",
-    aar = ":annotation-binary-aar",
+    binary_jar = ":annotation-binary.jar",
 )
 
 fb_native.prebuilt_jar(
@@ -26,19 +26,19 @@ fb_native.android_prebuilt_aar(
 )
 
 fb_native.remote_file(
-    name = "annotation-binary-aar",
-    sha1 = "ae6d46195467467fae746c6225f79ac41e7039e8",
-    url = "mvn:com.facebook.soloader:annotation:aar:0.8.2",
+    name = "annotation-binary.jar",
+    sha1 = "dc58463712cb3e5f03d8ee5ac9743b9ced9afa77",
+    url = "mvn:com.facebook.soloader:annotation:jar:0.9.0",
 )
 
 fb_native.remote_file(
     name = "nativeloader-binary.jar",
-    sha1 = "86cb3da9384707034355ac1e84e9a8cf6de80f7c",
-    url = "mvn:com.facebook.soloader:nativeloader:jar:0.8.2",
+    sha1 = "677c7fbfcc847d7eb6082048d07b10afd4cff898",
+    url = "mvn:com.facebook.soloader:nativeloader:jar:0.9.0",
 )
 
 fb_native.remote_file(
     name = "soloader-binary-aar",
-    sha1 = "8575dbdec464207a19273bd3c09d758a08fa655c",
-    url = "mvn:com.facebook.soloader:soloader:aar:0.8.2",
+    sha1 = "6e138af1dd29ceabf5bace2d24dc4333f304d104",
+    url = "mvn:com.facebook.soloader:soloader:aar:0.9.0",
 )

package/ReactAndroid/src/main/third-party/java/okhttp/BUCK

@@ -9,8 +9,8 @@ rn_prebuilt_jar(
 
 fb_native.remote_file(
     name = "okhttp3-binary.jar",
-    sha1 = "dc6d02e4e68514eff5631963e28ca7742ac69efe",
-    url = "mvn:com.squareup.okhttp3:okhttp:jar:3.12.1",
+    sha1 = "d3e1ce1d2b3119adf270b2d00d947beb03fe3321",
+    url = "mvn:com.squareup.okhttp3:okhttp:jar:3.12.12",
 )
 
 rn_prebuilt_jar(
@@ -21,6 +21,6 @@ rn_prebuilt_jar(
 
 fb_native.remote_file(
     name = "okhttp3-urlconnection-binary.jar",
-    sha1 = "f689d3657c3f1fdbde4877bcddc668491a4ad46f",
-    url = "mvn:com.squareup.okhttp3:okhttp-urlconnection:jar:3.12.1",
+    sha1 = "3cfbe11fb8c48d30600a70f90b3283fc858aea72",
+    url = "mvn:com.squareup.okhttp3:okhttp-urlconnection:jar:3.12.12",
 )

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -17,7 +17,7 @@ namespace facebook::react {
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 63;
-  int32_t Patch = 3;
+  int32_t Patch = 5;
   std::string_view Prerelease = "";
 } ReactNativeVersion;
 

package/android/com/facebook/react/react-native/0.63.5/react-native-0.63.5-javadoc.jar.md5

@@ -0,0 +1 @@
+d6a74868ea599fe5f2599244f726de7a

package/android/com/facebook/react/react-native/0.63.5/react-native-0.63.5-javadoc.jar.sha1

@@ -0,0 +1 @@
+dd13be1be798e27b1bf779fe830e017d6a308c2e

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

@@ -0,0 +1 @@
+d6df682546cc87c6b5357fdb0a48eb33

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

@@ -0,0 +1 @@
+84c51119ed1c0cf7727323a8665f9728035a6844

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

@@ -0,0 +1 @@
+1d3e342b606173c01781c7559a12efb5

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

@@ -0,0 +1 @@
+856e6591642eecaa4b6cefc20cb49f9ffa583190

package/android/com/facebook/react/react-native/{0.63.3/react-native-0.63.3.pom → 0.63.5/react-native-0.63.5.pom}

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
-  <version>0.63.3</version>
+  <version>0.63.5</version>
   <packaging>aar</packaging>
   <name>ReactNative</name>
   <description>A framework for building native apps with React</description>
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>com.facebook.soloader</groupId>
       <artifactId>soloader</artifactId>
-      <version>0.8.2</version>
+      <version>0.9.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -85,13 +85,13 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>3.12.1</version>
+      <version>3.12.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp-urlconnection</artifactId>
-      <version>3.12.1</version>
+      <version>3.12.12</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

package/android/com/facebook/react/react-native/0.63.5/react-native-0.63.5.pom.md5

@@ -0,0 +1 @@
+1d2a2cc6095a1df2b76803f3af3210b1

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

@@ -0,0 +1 @@
+9c4e09fbb5ab0f1acdbc0787f857e1fd15a3ca65

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

@@ -3,10 +3,10 @@
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
   <versioning>
-    <release>0.63.3</release>
+    <release>0.63.5</release>
     <versions>
-      <version>0.63.3</version>
+      <version>0.63.5</version>
     </versions>
-    <lastUpdated>20200929142730</lastUpdated>
+    <lastUpdated>20221107004318</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-0a24bdd6cf986759e8bf3a157fbf4a3e
+8784460c8277d0a469cc850c36dab947

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

@@ -1 +1 @@
-ebd6e06258c95fe41adc0fc9a81dbafee4afaafe
+1c177a301d8130b756b03534e55d54719a8580fe

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.63.3",
+  "version": "0.63.5",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",
@@ -123,7 +123,7 @@
     "clang-format": "^1.2.4",
     "connect": "^3.6.5",
     "coveralls": "^3.0.2",
-    "detox": "15.4.4",
+    "detox": "16.7.2",
     "eslint": "5.1.0",
     "eslint-config-fb-strict": "^24.9.0",
     "eslint-config-fbjs": "2.1.0",

package/react.gradle

@@ -302,6 +302,11 @@ afterEvaluate {
             enabled(currentBundleTask.enabled)
         }
 
+        // mergeResources task runs before the bundle file is copied to the intermediate asset directory from Android plugin 4.1+.
+        // This ensures to copy the bundle file before mergeResources task starts
+        def mergeResourcesTask = tasks.findByName("merge${targetName}Resources")
+        mergeResourcesTask.dependsOn(currentAssetsCopyTask)
+
         packageTask.dependsOn(currentAssetsCopyTask)
         if (buildPreBundleTask != null) {
             buildPreBundleTask.dependsOn(currentAssetsCopyTask)
@@ -349,3 +354,21 @@ afterEvaluate {
         }
     }
 }
+
+// Patch needed for https://github.com/facebook/react-native/issues/35210
+// This is a patch to short-circuit the "+" dependencies inside the
+// users' app/build.gradle file and the various .gradle files of libraries.
+// As using plain "+" dependencies causes Gradle to always download the latest,
+// this logic forces Gradle to use latest release in the minor series.
+project.rootProject.allprojects {
+    // This extra afterEvaluate is needed due to how AGP 3.x is resolving
+    // Gradle configurations.
+    afterEvaluate {
+        configurations.all {
+            resolutionStrategy {
+                force "com.facebook.react:react-native:0.63.+"
+                force "com.facebook.react:hermes-engine:0.63.+"
+            }
+        }
+    }
+}

package/template/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "16.13.1",
-    "react-native": "0.63.3"
+    "react-native": "0.63.5"
   },
   "devDependencies": {
     "@babel/core": "^7.8.4",

package/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3-javadoc.jar.md5

@@ -1 +0,0 @@
-5b731c933609168bfeeaddabd26abac2

package/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3-javadoc.jar.sha1

@@ -1 +0,0 @@
-74bb446b2827ebe14a9362ec986692002d09d831

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

@@ -1 +0,0 @@
-1e51a66c674970f493f8445fe0d2c248

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

@@ -1 +0,0 @@
-596a01837a6b53b36b3a6fc81c3b1f91b754b31a

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

@@ -1 +0,0 @@
-8a4fba261bbf3628671aeded320545ed

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

@@ -1 +0,0 @@
-7ef7d35f33970cd41528e0a9e50e8c2dc58554a3

package/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3.pom.md5

@@ -1 +0,0 @@
-84e55363915526db3048dc33f38e41df

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

@@ -1 +0,0 @@
-d8e4b8a55682a0783445b14c47e8105b8fb4635c