Merge branch 'facebook:main' into master

facebook · Oct 11, 2021 · 52049e8 · 52049e8
2 parents 6fe9c4f + 232d02c
commit 52049e8
Show file tree

Hide file tree

Showing 1,626 changed files with 101,534 additions and 65,784 deletions.
diff --git a/.buckconfig b/.buckconfig
@@ -8,7 +8,6 @@
 [maven_repositories]
   central = https://repo1.maven.org/maven2
   google = https://maven.google.com/
-  jcenter = https://jcenter.bintray.com/
 
 [alias]
   rntester = //packages/rn-tester/android/app:app
diff --git a/.bundle/config b/.bundle/config
@@ -0,0 +1,2 @@
+BUNDLE_PATH: "vendor/bundle"
+BUNDLE_FORCE_RUBY_PLATFORM: 1
diff --git a/.circleci/Dockerfiles/Dockerfile.android b/.circleci/Dockerfiles/Dockerfile.android
@@ -14,7 +14,7 @@
 # and build a Android application that can be used to run the
 # tests specified in the scripts/ directory.
 #
-FROM reactnativecommunity/react-native-android:3.2
+FROM reactnativecommunity/react-native-android:4.0
 
 LABEL Description="React Native Android Test Image"
 LABEL maintainer="Héctor Ramos <hector@fb.com>"
@@ -25,6 +25,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
 
 ADD .buckconfig /app/.buckconfig
 ADD .buckjavaargs /app/.buckjavaargs
+ADD BUCK /app/BUCK
 ADD Libraries /app/Libraries
 ADD ReactAndroid /app/ReactAndroid
 ADD ReactCommon /app/ReactCommon
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		BUNDLE_PATH: "vendor/bundle"
		BUNDLE_FORCE_RUBY_PLATFORM: 1