facebook · faisal-alamri · Jan 10, 2018 · Jan 10, 2018 · Jan 10, 2018 · Jan 10, 2018
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -46,11 +46,11 @@ aliases:
 
   - &restore-cache-buck
     keys:
-      - v2-buck-{{ arch }}-v2017.11.16.01
+      - v2-buck-{{ arch }}-v2017.09.04.02
   - &save-cache-buck
     paths:
       - ~/buck
-    key: v2-buck-{{ arch }}-v2017.11.16.01
+    key: v2-buck-{{ arch }}-v2017.09.04.02
 
   - &restore-cache-watchman
     keys:
@@ -67,7 +67,7 @@ aliases:
   - &install-buck
     |
       if [[ ! -e ~/buck ]]; then
-        git clone https://github.com/facebook/buck.git ~/buck --branch v2017.11.16.01 --depth=1
+        git clone https://github.com/facebook/buck.git ~/buck --branch v2017.09.04.02 --depth=1
       fi
       cd ~/buck && ant
       buck --version

diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js
@@ -14,7 +14,7 @@
 
 exports.version = {
   major: 0,
-  minor: 0,
-  patch: 0,
+  minor: 53,
+  patch: 1,
   prerelease: null,
 };
diff --git a/Libraries/Text/RCTText.xcodeproj/project.pbxproj b/Libraries/Text/RCTText.xcodeproj/project.pbxproj
@@ -86,6 +86,7 @@
 		59E6049B1FE9CB4A00BD90C5 /* RCTUITextField.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604501FE9CAF100BD90C5 /* RCTUITextField.h */; };
 		59E8C5CC1F8833D100204F5E /* RCTFontAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = A85C82991F742AA20036C019 /* RCTFontAttributes.m */; };
 		A85C829A1F742AA20036C019 /* RCTFontAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = A85C82991F742AA20036C019 /* RCTFontAttributes.m */; };
+		AD50D1DF20067E6F00A34797 /* RCTBaseTextInputViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5989E14C20018A2200EA444A /* RCTBaseTextInputViewManager.m */; };
 		AF3225F91DE5574F00D3E7E7 /* RCTConvert+Text.m in Sources */ = {isa = PBXBuildFile; fileRef = AF3225F81DE5574F00D3E7E7 /* RCTConvert+Text.m */; };
 		AF3225FA1DE5574F00D3E7E7 /* RCTConvert+Text.m in Sources */ = {isa = PBXBuildFile; fileRef = AF3225F81DE5574F00D3E7E7 /* RCTConvert+Text.m */; };
 /* End PBXBuildFile section */
@@ -380,6 +381,7 @@
 				59E6045D1FE9CAF100BD90C5 /* RCTMultilineTextInputShadowView.m in Sources */,
 				59E604591FE9CAF100BD90C5 /* RCTRawTextShadowView.m in Sources */,
 				59E604551FE9CAF100BD90C5 /* RCTTextView.m in Sources */,
+				AD50D1DF20067E6F00A34797 /* RCTBaseTextInputViewManager.m in Sources */,
 				59E604691FE9CAF100BD90C5 /* RCTTextSelection.m in Sources */,
 				59E6045F1FE9CAF100BD90C5 /* RCTMultilineTextInputView.m in Sources */,
 				59E604611FE9CAF100BD90C5 /* RCTMultilineTextInputViewManager.m in Sources */,

diff --git a/Libraries/Utilities/HMRClient.js b/Libraries/Utilities/HMRClient.js
@@ -121,7 +121,7 @@ Error: ${e.message}`
         }
         case 'error': {
           HMRLoadingView.hide();
-          throw new Error(data.body.type + ' ' + data.body.description);
+          throw new Error(`${data.body.type}: ${data.body.message}`);
         }
         default: {
           throw new Error(`Unexpected message: ${data}`);

diff --git a/React.podspec b/React.podspec
@@ -139,13 +139,13 @@ Pod::Spec.new do |s|
   s.subspec "cxxreact" do |ss|
     ss.dependency             "React/jschelpers"
     ss.dependency             "React/jsinspector"
-    ss.dependency             "boost"
+    ss.dependency             "boost-for-react-native", "1.63.0"
     ss.dependency             "Folly", "2016.09.26.00"
     ss.compiler_flags       = folly_compiler_flags
     ss.source_files         = "ReactCommon/cxxreact/*.{cpp,h}"
     ss.exclude_files        = "ReactCommon/cxxreact/SampleCxxModule.*"
     ss.private_header_files = "ReactCommon/cxxreact/*.h"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Folly\"" }
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Folly\"" }
   end
 
   s.subspec "ART" do |ss|
@@ -204,7 +204,7 @@ Pod::Spec.new do |s|
 
   s.subspec "RCTText" do |ss|
     ss.dependency             "React/Core"
-    ss.source_files         = "Libraries/Text/*.{h,m}"
+    ss.source_files         = "Libraries/Text/**/*.{h,m}"
   end
 
   s.subspec "RCTVibration" do |ss|

diff --git a/React/Base/RCTVersion.h b/React/Base/RCTVersion.h
@@ -11,7 +11,7 @@
 
 #define RCT_REACT_NATIVE_VERSION @{ \
   @"major": @(0), \
-  @"minor": @(0), \
-  @"patch": @(0), \
+  @"minor": @(53), \
+  @"patch": @(1), \
   @"prerelease": [NSNull null], \
 }
diff --git a/React/Views/RCTRefreshControl.m b/React/Views/RCTRefreshControl.m
@@ -44,7 +44,7 @@ - (void)layoutSubviews
   // If the control is refreshing when mounted we need to call
   // beginRefreshing in layoutSubview or it doesn't work.
   if (_currentRefreshingState && _isInitialRender) {
-    [self beginRefreshing];
+    [self beginRefreshingProgrammatically];
   }
   _isInitialRender = false;
 }

diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=1000.0.0-master
+VERSION_NAME=0.53.1
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
@@ -12,7 +12,6 @@ android_library(
     provided_deps = [
         react_native_dep("third-party/android/support/v4:lib-support-v4"),
     ],
-    required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
     ],

diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/common/BUCK
@@ -16,7 +16,6 @@ android_library(
     provided_deps = [
         react_native_dep("third-party/android/support/v4:lib-support-v4"),
     ],
-    required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
     ],

diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java
@@ -9,14 +9,17 @@
 
 package com.facebook.react.devsupport;
 
+import javax.annotation.Nullable;
+
+import java.util.HashMap;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicInteger;
+
 import android.os.Handler;
 import android.os.Looper;
+
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.JavaJSExecutor;
-import java.util.HashMap;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nullable;
 
 /**
  * Executes JS remotely via the react nodejs server as a proxy to a browser on the host machine.
@@ -157,7 +160,8 @@ public void close() {
   }
 
   @Override
-  public void loadApplicationScript(String sourceURL) throws JavaJSExecutor.ProxyExecutorException {
+  public void loadApplicationScript(String sourceURL)
+      throws ProxyExecutorException {
     JSExecutorCallbackFuture callback = new JSExecutorCallbackFuture();
     Assertions.assertNotNull(mWebSocketClient).loadApplicationScript(
         sourceURL,
@@ -172,7 +176,7 @@ public void loadApplicationScript(String sourceURL) throws JavaJSExecutor.ProxyE
 
   @Override
   public @Nullable String executeJSCall(String methodName, String jsonArgsArray)
-      throws JavaJSExecutor.ProxyExecutorException {
+      throws ProxyExecutorException {
     JSExecutorCallbackFuture callback = new JSExecutorCallbackFuture();
     Assertions.assertNotNull(mWebSocketClient).executeJSCall(
         methodName,

diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK
@@ -3,7 +3,6 @@ include_defs("//ReactAndroid/DEFS")
 android_library(
     name = "annotations",
     srcs = glob(["**/*.java"]),
-    required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
     ],

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
@@ -18,7 +18,7 @@
 public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
-      "minor", 0,
-      "patch", 0,
+      "minor", 53,
+      "patch", 1,
       "prerelease", null);
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
@@ -14,7 +14,6 @@ android_library(
     provided_deps = [
         react_native_dep("third-party/android/support/v4:lib-support-v4"),
     ],
-    required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
     ],

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/BUCK
@@ -3,7 +3,6 @@ include_defs("//ReactAndroid/DEFS")
 android_library(
     name = "annotations",
     srcs = glob(["*.java"]),
-    required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
     ],

diff --git a/...tAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.java b/...tAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.java
@@ -12,7 +12,7 @@
  */
 /* package */ class OpacityAnimation extends Animation {
 
-  static class OpacityAnimationListener implements Animation.AnimationListener {
+  static class OpacityAnimationListener implements AnimationListener {
 
     private final View mView;
     private boolean mLayerTypeChanged = false;

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/image/BUCK
@@ -11,7 +11,6 @@ android_library(
         react_native_dep("third-party/android/support-annotations:android-support-annotations"),
         react_native_dep("third-party/android/support/v4:lib-support-v4"),
     ],
-    required_for_source_only_abi = True,
     visibility = ["PUBLIC"],
     deps = [
         react_native_dep("third-party/java/jsr-305:jsr-305"),

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/modal/BUCK
@@ -3,7 +3,6 @@ include_defs("//ReactAndroid/DEFS")
 android_library(
     name = "modal",
     srcs = glob(["*.java"]),
-    required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
     ],

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK
@@ -3,7 +3,6 @@ include_defs("//ReactAndroid/DEFS")
 android_library(
     name = "text",
     srcs = glob(["*.java"]),
-    required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
     ],

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK
@@ -6,7 +6,6 @@ android_library(
     provided_deps = [
         react_native_dep("third-party/android/support/v4:lib-support-v4"),
     ],
-    required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
     ],

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
@@ -54,13 +54,13 @@ public class ReactViewGroup extends ViewGroup implements
 
   /**
    * This listener will be set for child views when removeClippedSubview property is enabled. When
-   * children layout is updated, it will call {@link #updateSubviewClipStatus} to notify parent view
-   * about that fact so that view can be attached/detached if necessary.
+   * children layout is updated, it will call {@link #updateSubviewClipStatus} to notify parent
+   * view about that fact so that view can be attached/detached if necessary.
    *
-   * <p>TODO(7728005): Attach/detach views in batch - once per frame in case when multiple children
+   * TODO(7728005): Attach/detach views in batch - once per frame in case when multiple children
    * update their layout.
    */
-  private static final class ChildrenLayoutChangeListener implements View.OnLayoutChangeListener {
+  private static final class ChildrenLayoutChangeListener implements OnLayoutChangeListener {
 
     private final ReactViewGroup mParent;
 
@@ -422,7 +422,7 @@ protected void onAttachedToWindow() {
   }
 
   @Override
-  public void addView(View child, int index, ViewGroup.LayoutParams params) {
+  public void addView(View child, int index, LayoutParams params) {
     // This will get called for every overload of addView so there is not need to override every method.
     mDrawingOrderHelper.handleAddView(child);
     setChildrenDrawingOrderEnabled(mDrawingOrderHelper.shouldEnableCustomDrawingOrder());
@@ -494,8 +494,7 @@ protected void dispatchSetPressed(boolean pressed) {
     addViewWithSubviewClippingEnabled(child, index, sDefaultLayoutParam);
   }
 
-  /*package*/ void addViewWithSubviewClippingEnabled(
-      View child, int index, ViewGroup.LayoutParams params) {
+  /*package*/ void addViewWithSubviewClippingEnabled(View child, int index, LayoutParams params) {
     Assertions.assertCondition(mRemoveClippedSubviews);
     Assertions.assertNotNull(mClippingRect);
     Assertions.assertNotNull(mAllChildren);

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/BUCK
@@ -6,7 +6,6 @@ android_library(
     provided_deps = [
         react_native_dep("third-party/android/support/v4:lib-support-v4"),
     ],
-    required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
     ],

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java
@@ -9,17 +9,19 @@
 
 package com.facebook.react.views.viewpager;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.events.NativeGestureUtil;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Wrapper view for {@link ViewPager}. It's forwarding calls to {@link ViewGroup#addView} to add
@@ -116,7 +118,7 @@ public boolean isViewFromObject(View view, Object object) {
     }
   }
 
-  private class PageChangeListener implements ViewPager.OnPageChangeListener {
+  private class PageChangeListener implements OnPageChangeListener {
 
     @Override
     public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {

diff --git a/ReactAndroid/src/main/jni/first-party/fb/BUCK b/ReactAndroid/src/main/jni/first-party/fb/BUCK
@@ -2,7 +2,7 @@ include_defs("//ReactAndroid/DEFS")
 
 # This target is only used in open source
 if IS_OSS_BUILD:
-  fb_xplat_cxx_library(
+  cxx_library(
     name = 'jni',
     soname = 'libfb.$(ext)',
     srcs = glob(['*.cpp', 'jni/*.cpp', 'lyra/*.cpp']),

diff --git a/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK b/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK
@@ -2,7 +2,7 @@ include_defs("//ReactAndroid/DEFS")
 
 include_defs("//ReactCommon/DEFS")
 
-fb_xplat_cxx_library(
+cxx_library(
     name = "fbgloginit",
     srcs = [
         "glog_init.cpp",

diff --git a/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK b/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK
@@ -7,7 +7,7 @@ include_defs("//ReactAndroid/DEFS")
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-fb_xplat_cxx_library(
+cxx_library(
     name = "jni-hack",
     header_namespace = "",
     exported_headers = [

diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/BUCK b/ReactAndroid/src/main/jni/first-party/yogajni/BUCK
@@ -2,7 +2,7 @@ include_defs("//ReactAndroid/DEFS")
 
 # This target is only used in open source
 if IS_OSS_BUILD:
-  fb_xplat_cxx_library(
+  cxx_library(
     name = 'jni',
     soname = 'libyoga.$(ext)',
     srcs = glob(['jni/*.cpp']),

diff --git a/ReactAndroid/src/main/jni/packagerconnection/BUCK b/ReactAndroid/src/main/jni/packagerconnection/BUCK
@@ -1,6 +1,6 @@
 include_defs("//ReactAndroid/DEFS")
 
-fb_xplat_cxx_library(
+cxx_library(
     name = "jni",
     srcs = glob(["*.cpp"]),
     headers = glob(

diff --git a/ReactAndroid/src/main/jni/react/jni/BUCK b/ReactAndroid/src/main/jni/react/jni/BUCK
@@ -20,7 +20,7 @@ EXPORTED_HEADERS = [
     "WritableNativeMap.h",
 ]
 
-fb_xplat_cxx_library(
+cxx_library(
     name = "jni",
     srcs = glob(["*.cpp"]),
     headers = glob(

diff --git a/ReactAndroid/src/main/jni/react/perftests/BUCK b/ReactAndroid/src/main/jni/react/perftests/BUCK
@@ -1,6 +1,6 @@
 include_defs("//ReactAndroid/DEFS")
 
-fb_xplat_cxx_library(
+cxx_library(
     name = "perftests",
     srcs = ["OnLoad.cpp"],
     compiler_flags = [

diff --git a/ReactCommon/microprofiler/BUCK b/ReactCommon/microprofiler/BUCK
@@ -1,6 +1,6 @@
 include_defs("//ReactCommon/DEFS")
 
-fb_xplat_cxx_library(
+cxx_library(
     name = "microprofiler",
     srcs = [
         "MicroProfiler.cpp",

diff --git a/ReactCommon/yoga/BUCK b/ReactCommon/yoga/BUCK
@@ -1,4 +1,4 @@
-fb_xplat_cxx_library(
+cxx_library(
     name = "yoga",
     srcs = glob(["yoga/*.cpp"]),
     header_namespace = "",