merge 0.71 stable to 0.63-stable

.buckconfig

@@ -1,14 +1,17 @@
 
 [android]
-  target = android-29
+  target = android-31
+
+[kotlin]
+  compile_against_abis = True
+  kotlin_version = 1.6.10
 
 [download]
   max_number_of_retries = 3
 
 [maven_repositories]
   central = https://repo1.maven.org/maven2
   google = https://maven.google.com/
-  jcenter = https://jcenter.bintray.com/
 
 [alias]
-  rntester = //RNTester/android/app:app
+  rntester = //packages/rn-tester/android/app:app

.bundle/config

@@ -0,0 +1,2 @@
+BUNDLE_PATH: "vendor/bundle"
+BUNDLE_FORCE_RUBY_PLATFORM: 1

.circleci/Dockerfiles/Dockerfile.android

@@ -14,25 +14,31 @@
 # and build a Android application that can be used to run the
 # tests specified in the scripts/ directory.
 #
-FROM reactnativecommunity/react-native-android:2019-10-18
+FROM reactnativecommunity/react-native-android:6.2
 
 LABEL Description="React Native Android Test Image"
 LABEL maintainer="Héctor Ramos <hector@fb.com>"
 
 # set default environment variables
 ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
-ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
+ENV KOTLIN_HOME="third-party/kotlin"
 
 ADD .buckconfig /app/.buckconfig
 ADD .buckjavaargs /app/.buckjavaargs
-ADD tools /app/tools
+ADD BUCK /app/BUCK
+ADD Libraries /app/Libraries
 ADD ReactAndroid /app/ReactAndroid
 ADD ReactCommon /app/ReactCommon
 ADD React /app/React
 ADD keystores /app/keystores
+ADD packages/react-native-codegen /app/packages/react-native-codegen
+ADD tools /app/tools
+add scripts /app/scripts
 
 WORKDIR /app
 
+RUN scripts/download-kotlin-compiler-with-buck.sh
+
 RUN buck fetch ReactAndroid/src/test/java/com/facebook/react/modules
 RUN buck fetch ReactAndroid/src/main/java/com/facebook/react
 RUN buck fetch ReactAndroid/src/main/java/com/facebook/react/shell
@@ -46,7 +52,4 @@ ADD . /app
 
 RUN yarn
 
-RUN ./gradlew :ReactAndroid:downloadBoost :ReactAndroid:downloadDoubleConversion :ReactAndroid:downloadFolly :ReactAndroid:downloadGlog
-
-RUN ./gradlew :ReactAndroid:packageReactNdkLibsForBuck -Pjobs=1
-
+RUN ./gradlew :ReactAndroid:assembleDebug

.circleci/Dockerfiles/scripts/run-android-ci-instrumentation-tests.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

.circleci/Dockerfiles/scripts/run-android-docker-instrumentation-tests.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) Facebook, Inc. and its affiliates.
+# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
@@ -10,7 +10,7 @@ mount -o remount,exec /dev/shm
 AVD_UUID=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)
 
 # create virtual device
-echo no | android create avd -n "$AVD_UUID" -f -t android-19 --abi default/armeabi-v7a
+echo no | android create avd -n "$AVD_UUID" -f -t android-21 --abi default/armeabi-v7a
 
 # emulator setup
 emulator64-arm -avd $AVD_UUID -no-skin -no-audio -no-window -no-boot-anim &
@@ -33,7 +33,7 @@ node cli.js bundle --platform android --dev true --entry-file ReactAndroid/src/a
 
 # build test APK
 # shellcheck disable=SC1091
-source ./scripts/android-setup.sh && NO_BUCKD=1 retry3 buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=1
+source ./scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=1
 
 # run installed apk with tests
 node ./.circleci/Dockerfiles/scripts/run-android-ci-instrumentation-tests.js "$*"

.circleci/Dockerfiles/scripts/run-android-docker-unit-tests.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) Facebook, Inc. and its affiliates.
+# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.

.circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) Facebook, Inc. and its affiliates.
+# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
@@ -67,11 +67,6 @@ while :; do
       shift
       ;;
 
-    --tvos)
-      RUN_IOS=1
-      shift
-      ;;
-
     *)
       break
   esac
@@ -114,7 +109,7 @@ function e2e_suite() {
 
         # create virtual device
         if ! android list avd | grep "$AVD_UUID" > /dev/null; then
-            echo no | android create avd -n "$AVD_UUID" -f -t android-19 --abi default/armeabi-v7a
+            echo no | android create avd -n "$AVD_UUID" -f -t android-21 --abi default/armeabi-v7a
         fi
 
         # newline at end of adb devices call and first line is headers
@@ -199,7 +194,7 @@ function e2e_suite() {
         return 1
       fi
 
-      echo "Starting packager server"
+      echo "Starting Metro"
       npm start >> /dev/null &
       SERVER_PID=$!
       sleep 15

.circleci/Dockerfiles/scripts/run-instrumentation-tests-via-adb-shell.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) Facebook, Inc. and its affiliates.
+# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.