Merge branch 'ExpensifyRC1-0.72.0-alpha.0' of https://github.com/Expe…

…nsify/react-native into cursor-position-x-y

.babelrc

@@ -0,0 +1,8 @@
+{
+    "presets": [
+        "module:metro-react-native-babel-preset"
+    ],
+    "plugins": [
+        "babel-plugin-transform-flow-enums"
+    ]
+}

.buckconfig

@@ -15,3 +15,6 @@
 
 [alias]
   rntester = //packages/rn-tester/android/app:app
+
+[buildfile]
+  includes = //tools/build_defs/oss/preload.bzl

.circleci/Dockerfiles/Dockerfile.android

@@ -14,43 +14,36 @@
 # and build a Android application that can be used to run the
 # tests specified in the scripts/ directory.
 #
-FROM reactnativecommunity/react-native-android:5.4
+FROM reactnativecommunity/react-native-android:7.0
 
 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"
+ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dfile.encoding=utf-8 -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
+ENV KOTLIN_HOME="packages/react-native/third-party/kotlin"
 
 ADD .buckconfig /app/.buckconfig
 ADD .buckjavaargs /app/.buckjavaargs
 ADD BUCK /app/BUCK
-ADD Libraries /app/Libraries
-ADD ReactAndroid /app/ReactAndroid
-ADD ReactCommon /app/ReactCommon
-ADD React /app/React
+ADD packages/react-native/Libraries /app/packages/react-native/Libraries
+ADD packages/react-native/ReactAndroid /app/packages/react-native/ReactAndroid
+ADD packages/react-native/ReactCommon /app/packages/react-native/ReactCommon
+ADD packages/react-native/React /app/packages/react-native/React
 ADD keystores /app/keystores
 ADD packages/react-native-codegen /app/packages/react-native-codegen
 ADD tools /app/tools
-add scripts /app/scripts
+ADD scripts /app/scripts
 
 WORKDIR /app
 
-RUN scripts/download-kotlin-compiler-with-buck.sh
+RUN scripts/buck/buck_fetch.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
-RUN buck fetch ReactAndroid/src/test/...
-RUN buck fetch ReactAndroid/src/androidTest/...
-
-RUN buck build ReactAndroid/src/main/java/com/facebook/react
-RUN buck build ReactAndroid/src/main/java/com/facebook/react/shell
+RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
+RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell
 
 ADD . /app
 
 RUN yarn
 
-RUN ./gradlew :ReactAndroid:assembleDebug
+RUN ./gradlew :packages:react-native:ReactAndroid:assembleDebug

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

@@ -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-ci-e2e-tests.sh

@@ -141,7 +141,7 @@ function e2e_suite() {
       fi
     fi
 
-    if ! npm pack
+    if ! (cd packages/react-native && FILENAME=$(npm pack | tail -1) && mv "$FILENAME" ../../)
     then
       echo "Failed to pack react-native"
       return 1