react-native-tvos 0.64.2-2 → 0.66.3-0

package/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java

@@ -111,10 +111,11 @@ public class RootViewTest {
 
     ReactRootView rootView = new ReactRootView(mReactContext);
     rootView.setId(rootViewId);
+    rootView.setRootViewTag(rootViewId);
     rootView.startReactApplication(instanceManager, "");
     rootView.simulateAttachForTesting();
 
-    long ts = SystemClock.uptimeMillis();
+    long ts = SystemClock.currentTimeMillis();
 
     // Test ACTION_DOWN event
     rootView.onTouchEvent(MotionEvent.obtain(100, ts, MotionEvent.ACTION_DOWN, 0, 0, 0));
@@ -149,7 +150,9 @@ public class RootViewTest {
                 "timestamp",
                 (double) ts,
                 "identifier",
-                0.));
+                0.,
+                "targetSurface",
+                -1));
 
     // Test ACTION_UP event
     reset(eventEmitterModuleMock, eventDispatcher);
@@ -185,7 +188,9 @@ public class RootViewTest {
                 "timestamp",
                 (double) ts,
                 "identifier",
-                0.));
+                0.,
+                "targetSurface",
+                -1));
 
     // Test other action
     reset(eventDispatcher);

package/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java

@@ -90,7 +90,7 @@ public class NativeAnimatedNodeTraversalTest {
     mFrameTimeNanos = INITIAL_FRAME_TIME_NANOS;
 
     mReactApplicationContextMock = mock(ReactApplicationContext.class);
-    PowerMockito.when(mReactApplicationContextMock.hasActiveCatalystInstance())
+    PowerMockito.when(mReactApplicationContextMock.hasActiveReactInstance())
         .thenAnswer(
             new Answer<Boolean>() {
               @Override

package/ReactAndroid/src/test/java/com/facebook/react/bridge/BUCK

@@ -10,12 +10,13 @@ rn_android_library(
         ["*.java"],
         exclude = STANDARD_TEST_SRCS,
     ),
+    autoglob = False,
     visibility = [
         "PUBLIC",
     ],
     deps = [
         react_native_android_toplevel_dep("third-party/java/mockito2:mockito2"),
-        react_native_dep("third-party/java/robolectric/4.4:robolectric"),
+        react_native_dep("third-party/java/robolectric:robolectric"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_tests_target("java/org/mockito/configuration:configuration"),

package/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java

@@ -52,6 +52,7 @@ public class ReactTestHelper {
     when(reactInstance.getReactQueueConfiguration()).thenReturn(ReactQueueConfiguration);
     when(reactInstance.getNativeModule(UIManagerModule.class))
         .thenReturn(mock(UIManagerModule.class));
+    when(reactInstance.isDestroyed()).thenReturn(false);
 
     return reactInstance;
   }

package/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java

@@ -11,6 +11,7 @@ import static org.mockito.Mockito.*;
 
 import com.facebook.react.common.JavascriptException;
 import java.util.HashMap;
+import okhttp3.WebSocket;
 import okio.ByteString;
 import org.junit.Rule;
 import org.junit.Test;
@@ -74,7 +75,8 @@ public class JSDebuggerWebSocketClientTest {
   public void test_onMessage_WithInvalidContentType_ShouldNotTriggerCallbacks() throws Exception {
     JSDebuggerWebSocketClient client = PowerMockito.spy(new JSDebuggerWebSocketClient());
 
-    client.onMessage(null, ByteString.encodeUtf8("{\"replyID\":0, \"result\":\"OK\"}"));
+    client.onMessage(
+        mock(WebSocket.class), ByteString.encodeUtf8("{\"replyID\":0, \"result\":\"OK\"}"));
     PowerMockito.verifyPrivate(client, never())
         .invoke("triggerRequestSuccess", anyInt(), nullable(String.class));
     PowerMockito.verifyPrivate(client, never()).invoke("triggerRequestFailure", anyInt(), any());

package/ReactAndroid/src/test/java/com/facebook/react/modules/BUCK

@@ -32,6 +32,7 @@ rn_robolectric_test(
         react_native_target("java/com/facebook/react/modules/common:common"),
         react_native_target("java/com/facebook/react/modules/core:core"),
         react_native_target("java/com/facebook/react/modules/debug:debug"),
+        react_native_target("java/com/facebook/react/modules/deviceinfo:deviceinfo"),
         react_native_target("java/com/facebook/react/modules/dialog:dialog"),
         react_native_target("java/com/facebook/react/modules/network:network"),
         react_native_target("java/com/facebook/react/modules/share:share"),

package/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.java

@@ -0,0 +1,168 @@
+/*
+ * 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.
+ */
+
+package com.facebook.react.modules.deviceinfo;
+
+import static org.fest.assertions.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.CatalystInstance;
+import com.facebook.react.bridge.JavaOnlyMap;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactTestHelper;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.facebook.react.uimanager.DisplayMetricsHolder;
+import java.util.Arrays;
+import java.util.List;
+import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.rule.PowerMockRule;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+@PrepareForTest({Arguments.class, DisplayMetricsHolder.class})
+@PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "androidx.*", "android.*"})
+public class DeviceInfoModuleTest extends TestCase {
+
+  @Rule public PowerMockRule rule = new PowerMockRule();
+
+  private DeviceInfoModule mDeviceInfoModule;
+  private DeviceEventManagerModule.RCTDeviceEventEmitter mRCTDeviceEventEmitterMock;
+
+  private WritableMap fakePortraitDisplayMetrics;
+  private WritableMap fakeLandscapeDisplayMetrics;
+
+  @Before
+  public void setUp() {
+    initTestData();
+
+    mockStatic(DisplayMetricsHolder.class);
+
+    mRCTDeviceEventEmitterMock = mock(DeviceEventManagerModule.RCTDeviceEventEmitter.class);
+
+    final ReactApplicationContext context =
+        spy(new ReactApplicationContext(RuntimeEnvironment.application));
+    CatalystInstance catalystInstanceMock = ReactTestHelper.createMockCatalystInstance();
+    context.initializeWithInstance(catalystInstanceMock);
+    when(context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class))
+        .thenReturn(mRCTDeviceEventEmitterMock);
+
+    mDeviceInfoModule = new DeviceInfoModule(context);
+  }
+
+  @After
+  public void teardown() {
+    DisplayMetricsHolder.setWindowDisplayMetrics(null);
+    DisplayMetricsHolder.setScreenDisplayMetrics(null);
+  }
+
+  @Test
+  public void test_itDoesNotEmitAnEvent_whenDisplayMetricsNotChanged() {
+    givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics);
+
+    mDeviceInfoModule.getTypedExportedConstants();
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+
+    verifyNoMoreInteractions(mRCTDeviceEventEmitterMock);
+  }
+
+  @Test
+  public void test_itEmitsOneEvent_whenDisplayMetricsChangedOnce() {
+    givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics);
+
+    mDeviceInfoModule.getTypedExportedConstants();
+    givenDisplayMetricsHolderContains(fakeLandscapeDisplayMetrics);
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+
+    verifyUpdateDimensionsEventsEmitted(mRCTDeviceEventEmitterMock, fakeLandscapeDisplayMetrics);
+  }
+
+  @Test
+  public void test_itEmitsJustOneEvent_whenUpdateRequestedMultipleTimes() {
+    givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics);
+    mDeviceInfoModule.getTypedExportedConstants();
+    givenDisplayMetricsHolderContains(fakeLandscapeDisplayMetrics);
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+
+    verifyUpdateDimensionsEventsEmitted(mRCTDeviceEventEmitterMock, fakeLandscapeDisplayMetrics);
+  }
+
+  @Test
+  public void test_itEmitsMultipleEvents_whenDisplayMetricsChangedBetweenUpdates() {
+    givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics);
+
+    mDeviceInfoModule.getTypedExportedConstants();
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+    givenDisplayMetricsHolderContains(fakeLandscapeDisplayMetrics);
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+    givenDisplayMetricsHolderContains(fakePortraitDisplayMetrics);
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+    givenDisplayMetricsHolderContains(fakeLandscapeDisplayMetrics);
+    mDeviceInfoModule.emitUpdateDimensionsEvent();
+
+    verifyUpdateDimensionsEventsEmitted(
+        mRCTDeviceEventEmitterMock,
+        fakeLandscapeDisplayMetrics,
+        fakePortraitDisplayMetrics,
+        fakeLandscapeDisplayMetrics);
+  }
+
+  private static void givenDisplayMetricsHolderContains(final WritableMap fakeDisplayMetrics) {
+    when(DisplayMetricsHolder.getDisplayMetricsWritableMap(1.0)).thenReturn(fakeDisplayMetrics);
+  }
+
+  private static void verifyUpdateDimensionsEventsEmitted(
+      DeviceEventManagerModule.RCTDeviceEventEmitter emitter, WritableMap... expectedEvents) {
+    List<WritableMap> expectedEventList = Arrays.asList(expectedEvents);
+    ArgumentCaptor<WritableMap> captor = ArgumentCaptor.forClass(WritableMap.class);
+    verify(emitter, times(expectedEventList.size()))
+        .emit(eq("didUpdateDimensions"), captor.capture());
+
+    List<WritableMap> actualEvents = captor.getAllValues();
+    assertThat(actualEvents).isEqualTo(expectedEventList);
+  }
+
+  private void initTestData() {
+    mockStatic(Arguments.class);
+    when(Arguments.createMap())
+        .thenAnswer(
+            new Answer<Object>() {
+              @Override
+              public Object answer(InvocationOnMock invocation) throws Throwable {
+                return new JavaOnlyMap();
+              }
+            });
+
+    fakePortraitDisplayMetrics = Arguments.createMap();
+    fakePortraitDisplayMetrics.putInt("width", 100);
+    fakePortraitDisplayMetrics.putInt("height", 200);
+
+    fakeLandscapeDisplayMetrics = Arguments.createMap();
+    fakeLandscapeDisplayMetrics.putInt("width", 200);
+    fakeLandscapeDisplayMetrics.putInt("height", 100);
+  }
+}

package/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java

@@ -60,7 +60,7 @@ public class DialogModuleTest {
     mActivity = mActivityController.create().start().resume().get();
 
     final ReactApplicationContext context = PowerMockito.mock(ReactApplicationContext.class);
-    PowerMockito.when(context.hasActiveCatalystInstance()).thenReturn(true);
+    PowerMockito.when(context.hasActiveReactInstance()).thenReturn(true);
     PowerMockito.when(context, "getCurrentActivity").thenReturn(mActivity);
 
     mDialogModule = new DialogModule(context);

package/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java

@@ -76,8 +76,8 @@ public class NetworkingModuleTest {
 
   @Before
   public void prepareModules() {
-    mHttpClient = mock(OkHttpClient.class);
-    when(mHttpClient.cookieJar()).thenReturn(mock(CookieJarContainer.class));
+    mHttpClient = PowerMockito.mock(OkHttpClient.class);
+    PowerMockito.when(mHttpClient.cookieJar()).thenReturn(mock(CookieJarContainer.class));
     when(mHttpClient.newCall(any(Request.class)))
         .thenAnswer(
             new Answer<Object>() {
@@ -87,8 +87,8 @@ public class NetworkingModuleTest {
                 return callMock;
               }
             });
-    OkHttpClient.Builder clientBuilder = mock(OkHttpClient.Builder.class);
-    when(clientBuilder.build()).thenReturn(mHttpClient);
+    OkHttpClient.Builder clientBuilder = PowerMockito.mock(OkHttpClient.Builder.class);
+    PowerMockito.when(clientBuilder.build()).thenReturn(mHttpClient);
     when(mHttpClient.newBuilder()).thenReturn(clientBuilder);
 
     mEmitter = mock(RCTDeviceEventEmitter.class);
@@ -96,7 +96,7 @@ public class NetworkingModuleTest {
     CatalystInstance reactInstance = mock(CatalystInstance.class);
     ReactApplicationContext reactContext = mock(ReactApplicationContext.class);
     when(reactContext.getCatalystInstance()).thenReturn(reactInstance);
-    when(reactContext.hasActiveCatalystInstance()).thenReturn(true);
+    when(reactContext.hasActiveReactInstance()).thenReturn(true);
     when(reactContext.getJSModule(any(Class.class))).thenReturn(mEmitter);
     mNetworkingModule = new NetworkingModule(reactContext, "", mHttpClient);
   }
@@ -453,7 +453,7 @@ public class NetworkingModuleTest {
         .thenCallRealMethod();
     when(inputStream.available()).thenReturn("imageUri".length());
 
-    final MultipartBody.Builder multipartBuilder = mock(MultipartBody.Builder.class);
+    final MultipartBody.Builder multipartBuilder = PowerMockito.mock(MultipartBody.Builder.class);
     PowerMockito.whenNew(MultipartBody.Builder.class)
         .withNoArguments()
         .thenReturn(multipartBuilder);
@@ -545,7 +545,7 @@ public class NetworkingModuleTest {
   }
 
   @Test
-  public void testCancelAllCallsOnCatalystInstanceDestroy() throws Exception {
+  public void testCancelAllCallsInvalidate() throws Exception {
     PowerMockito.mockStatic(OkHttpCallUtil.class);
     final int requests = 3;
     final Call[] calls = new Call[requests];
@@ -578,7 +578,7 @@ public class NetworkingModuleTest {
     }
     verify(mHttpClient, times(3)).newCall(any(Request.class));
 
-    mNetworkingModule.onCatalystInstanceDestroy();
+    mNetworkingModule.invalidate();
     PowerMockito.verifyStatic(OkHttpCallUtil.class, times(3));
     ArgumentCaptor<OkHttpClient> clientArguments = ArgumentCaptor.forClass(OkHttpClient.class);
     ArgumentCaptor<Integer> requestIdArguments = ArgumentCaptor.forClass(Integer.class);
@@ -591,7 +591,7 @@ public class NetworkingModuleTest {
   }
 
   @Test
-  public void testCancelSomeCallsOnCatalystInstanceDestroy() throws Exception {
+  public void testCancelSomeCallsInvalidate() throws Exception {
     PowerMockito.mockStatic(OkHttpCallUtil.class);
     final int requests = 3;
     final Call[] calls = new Call[requests];
@@ -634,7 +634,7 @@ public class NetworkingModuleTest {
     // verifyStatic actually does not clear all calls so far, so we have to check for all of them.
     // If `cancelTag` would've been called again for the aborted call, we would have had
     // `requests + 1` calls.
-    mNetworkingModule.onCatalystInstanceDestroy();
+    mNetworkingModule.invalidate();
     PowerMockito.verifyStatic(OkHttpCallUtil.class, times(requests));
     clientArguments = ArgumentCaptor.forClass(OkHttpClient.class);
     requestIdArguments = ArgumentCaptor.forClass(Integer.class);

package/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java

@@ -75,7 +75,7 @@ public class TimingModuleTest {
     CatalystInstance reactInstance = mock(CatalystInstance.class);
     ReactApplicationContext reactContext = mock(ReactApplicationContext.class);
     when(reactContext.getCatalystInstance()).thenReturn(reactInstance);
-    when(reactContext.hasActiveCatalystInstance()).thenReturn(true);
+    when(reactContext.hasActiveReactInstance()).thenReturn(true);
 
     mCurrentTimeNs = 0;
     mPostFrameCallbackHandler = new PostFrameCallbackHandler();

package/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.java

@@ -10,19 +10,33 @@ package com.facebook.react.uimanager;
 import static org.fest.assertions.api.Assertions.assertThat;
 
 import com.facebook.react.R;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.JavaOnlyMap;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
 import com.facebook.react.views.view.ReactViewGroup;
 import com.facebook.react.views.view.ReactViewManager;
 import java.util.Locale;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.rule.PowerMockRule;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
+@PrepareForTest({Arguments.class})
 @RunWith(RobolectricTestRunner.class)
+@PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "androidx.*", "android.*"})
 public class BaseViewManagerTest {
 
+  @Rule public PowerMockRule rule = new PowerMockRule();
+
   private BaseViewManager mViewManager;
   private ReactViewGroup mView;
 
@@ -30,6 +44,15 @@ public class BaseViewManagerTest {
   public void setUp() {
     mViewManager = new ReactViewManager();
     mView = new ReactViewGroup(RuntimeEnvironment.application);
+    PowerMockito.mockStatic(Arguments.class);
+    PowerMockito.when(Arguments.createMap())
+        .thenAnswer(
+            new Answer<Object>() {
+              @Override
+              public Object answer(InvocationOnMock invocation) throws Throwable {
+                return new JavaOnlyMap();
+              }
+            });
   }
 
   @Test
@@ -44,4 +67,13 @@ public class BaseViewManagerTest {
     mViewManager.setAccessibilityRole(mView, "image");
     assertThat(mView.getTag(R.id.accessibility_role)).isEqualTo(AccessibilityRole.IMAGE);
   }
+
+  @Test
+  public void testAccessibilityStateSelected() {
+    WritableMap accessibilityState = Arguments.createMap();
+    accessibilityState.putBoolean("selected", true);
+    mViewManager.setViewState(mView, accessibilityState);
+    assertThat(mView.getTag(R.id.accessibility_state)).isEqualTo(accessibilityState);
+    assertThat(mView.isSelected()).isEqualTo(true);
+  }
 }

package/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java

@@ -36,6 +36,8 @@ public class SimpleViewPropertyTest {
 
   @Rule public PowerMockRule rule = new PowerMockRule();
 
+  private static int sViewTag = 2;
+
   private static class ConcreteViewManager extends SimpleViewManager<View> {
 
     @ReactProp(name = "foo")
@@ -75,7 +77,9 @@ public class SimpleViewPropertyTest {
 
   @Test
   public void testOpacity() {
-    View view = mManager.createView(mThemedContext, buildStyles(), null, new JSResponderHandler());
+    View view =
+        mManager.createView(
+            sViewTag, mThemedContext, buildStyles(), null, new JSResponderHandler());
 
     mManager.updateProperties(view, buildStyles());
     assertThat(view.getAlpha()).isEqualTo(1.0f);
@@ -89,7 +93,9 @@ public class SimpleViewPropertyTest {
 
   @Test
   public void testBackgroundColor() {
-    View view = mManager.createView(mThemedContext, buildStyles(), null, new JSResponderHandler());
+    View view =
+        mManager.createView(
+            sViewTag, mThemedContext, buildStyles(), null, new JSResponderHandler());
 
     mManager.updateProperties(view, buildStyles());
     assertThat(view.getBackground()).isEqualTo(null);

package/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java

@@ -120,6 +120,14 @@ public class ReactImagePropertyTest {
     viewManager.updateProperties(view, buildStyles("borderRadius", null));
   }
 
+  @Test
+  public void testAccessibilityFocus() {
+    ReactImageManager viewManager = new ReactImageManager();
+    ReactImageView view = viewManager.createViewInstance(mThemeContext);
+    viewManager.setAccessible(view, true);
+    assertEquals(true, view.isFocusable());
+  }
+
   @Test
   public void testTintColor() {
     ReactImageManager viewManager = new ReactImageManager();

package/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java

@@ -221,6 +221,7 @@ public class ReactTextInputPropertyTest {
   public void testKeyboardType() {
     ReactEditText view = mManager.createViewInstance(mThemedContext);
     int numberPadTypeFlags = InputType.TYPE_CLASS_NUMBER;
+    int urlTypeFlags = InputType.TYPE_TEXT_VARIATION_URI;
     int decimalPadTypeFlags = InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL;
     int numericTypeFlags =
         InputType.TYPE_CLASS_NUMBER
@@ -246,6 +247,9 @@ public class ReactTextInputPropertyTest {
     mManager.updateProperties(view, buildStyles("keyboardType", "number-pad"));
     assertThat(view.getInputType() & generalKeyboardTypeFlags).isEqualTo(numberPadTypeFlags);
 
+    mManager.updateProperties(view, buildStyles("keyboardType", "url"));
+    assertThat(view.getInputType() & generalKeyboardTypeFlags).isEqualTo(urlTypeFlags);
+
     mManager.updateProperties(view, buildStyles("keyboardType", "decimal-pad"));
     assertThat(view.getInputType() & generalKeyboardTypeFlags).isEqualTo(decimalPadTypeFlags);
 

package/ReactAndroid/src/test/java/org/mockito/configuration/BUCK

@@ -3,6 +3,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_android_toplevel_dep",
 rn_android_library(
     name = "configuration",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     visibility = [
         "PUBLIC",
     ],

package/ReactCommon/React-Fabric.podspec

@@ -11,13 +11,13 @@ version = package['version']
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
 else
   source[:tag] = "v#{version}"
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.06.28.00-v2'
 folly_dep_name = 'RCT-Folly/Fabric'
 boost_compiler_flags = '-Wno-documentation'
 
@@ -28,12 +28,12 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "11.0", :tvos => "11.0" }
   s.source                 = source
   s.source_files           = "dummyFile.cpp"
   s.library                = "stdc++"
   s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES",
-                            "CLANG_CXX_LANGUAGE_STANDARD" => "c++14" }
+                            "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" }
 
   s.dependency folly_dep_name, folly_version
   s.dependency "React-graphics", version
@@ -82,7 +82,7 @@ Pod::Spec.new do |s|
     ss.source_files         = "react/renderer/core/**/*.{m,mm,cpp,h}"
     ss.exclude_files        = "react/renderer/core/tests"
     ss.header_dir           = "react/renderer/core"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
   s.subspec "componentregistry" do |ss|
@@ -93,6 +93,14 @@ Pod::Spec.new do |s|
     ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
+  s.subspec "componentregistrynative" do |ss|
+    ss.dependency             folly_dep_name, folly_version
+    ss.compiler_flags       = folly_compiler_flags
+    ss.source_files         = "react/renderer/componentregistry/native/**/*.{m,mm,cpp,h}"
+    ss.header_dir           = "react/renderer/componentregistry/native"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+  end
+
   s.subspec "components" do |ss|
     ss.subspec "activityindicator" do |sss|
       sss.dependency             folly_dep_name, folly_version
@@ -139,15 +147,6 @@ Pod::Spec.new do |s|
       sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
     end
 
-    ss.subspec "picker" do |sss|
-      sss.dependency             folly_dep_name, folly_version
-      sss.compiler_flags       = folly_compiler_flags
-      sss.source_files         = "react/renderer/components/picker/iospicker/**/*.{m,mm,cpp,h}"
-      sss.exclude_files        = "react/renderer/components/picker/iospicker/tests"
-      sss.header_dir           = "react/renderer/components/iospicker"
-      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
-    end
-
     ss.subspec "rncore" do |sss|
       sss.dependency             folly_dep_name, folly_version
       sss.compiler_flags       = folly_compiler_flags
@@ -232,7 +231,16 @@ Pod::Spec.new do |s|
     end
   end
 
-  s.subspec "debug" do |ss|
+  s.subspec "debug_core" do |ss|
+    ss.dependency             folly_dep_name, folly_version
+    ss.compiler_flags       = folly_compiler_flags
+    ss.source_files         = "react/debug/**/*.{m,mm,cpp,h}"
+    ss.exclude_files        = "react/debug/tests"
+    ss.header_dir           = "react/debug"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+  end
+
+  s.subspec "debug_renderer" do |ss|
     ss.dependency             folly_dep_name, folly_version
     ss.compiler_flags       = folly_compiler_flags
     ss.source_files         = "react/renderer/debug/**/*.{m,mm,cpp,h}"
@@ -301,6 +309,33 @@ Pod::Spec.new do |s|
     ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
   end
 
+  s.subspec "telemetry" do |ss|
+    ss.dependency             folly_dep_name, folly_version
+    ss.compiler_flags       = folly_compiler_flags
+    ss.source_files         = "react/renderer/telemetry/**/*.{m,mm,cpp,h}"
+    ss.exclude_files        = "react/renderer/telemetry/tests"
+    ss.header_dir           = "react/renderer/telemetry"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+  end
+
+  s.subspec "leakchecker" do |ss|
+    ss.dependency             folly_dep_name, folly_version
+    ss.compiler_flags       = folly_compiler_flags
+    ss.source_files         = "react/renderer/leakchecker/**/*.{cpp,h}"
+    ss.exclude_files        = "react/renderer/leakchecker/tests"
+    ss.header_dir           = "react/renderer/leakchecker"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+  end
+
+  s.subspec "runtimescheduler" do |ss|
+    ss.dependency             folly_dep_name, folly_version
+    ss.compiler_flags       = folly_compiler_flags
+    ss.source_files         = "react/renderer/runtimescheduler/**/*.{cpp,h}"
+    ss.exclude_files        = "react/renderer/runtimescheduler/tests"
+    ss.header_dir           = "react/renderer/runtimescheduler"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+  end
+
   s.subspec "utils" do |ss|
     ss.source_files         = "react/utils/*.{m,mm,cpp,h}"
     ss.header_dir           = "react/utils"