Skip to content

Commit 75cc358

Browse files
committed
Merge commit 'adb2962fee968d7ae20ec32a55dc69e4ebb3ce12' into realize-last-focused
2 parents eb64202 + adb2962 commit 75cc358

File tree

697 files changed

+16014
-89406
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

697 files changed

+16014
-89406
lines changed

.buckconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
[android]
33
target = android-31
44

5+
[kotlin]
6+
compile_against_abis = True
7+
kotlin_version = 1.6.10
8+
59
[download]
610
max_number_of_retries = 3
711

.circleci/Dockerfiles/Dockerfile.android

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414
# and build a Android application that can be used to run the
1515
# tests specified in the scripts/ directory.
1616
#
17-
FROM reactnativecommunity/react-native-android:5.2
17+
FROM reactnativecommunity/react-native-android:5.4
1818

1919
LABEL Description="React Native Android Test Image"
2020
LABEL maintainer="Héctor Ramos <[email protected]>"
2121

2222
# set default environment variables
2323
ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
2424
ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
25+
ENV KOTLIN_HOME="third-party/kotlin"
2526

2627
ADD .buckconfig /app/.buckconfig
2728
ADD .buckjavaargs /app/.buckjavaargs
@@ -33,9 +34,12 @@ ADD React /app/React
3334
ADD keystores /app/keystores
3435
ADD packages/react-native-codegen /app/packages/react-native-codegen
3536
ADD tools /app/tools
37+
add scripts /app/scripts
3638

3739
WORKDIR /app
3840

41+
RUN scripts/download-kotlin-compiler-with-buck.sh
42+
3943
RUN buck fetch ReactAndroid/src/test/java/com/facebook/react/modules
4044
RUN buck fetch ReactAndroid/src/main/java/com/facebook/react
4145
RUN buck fetch ReactAndroid/src/main/java/com/facebook/react/shell
@@ -49,6 +53,4 @@ ADD . /app
4953

5054
RUN yarn
5155

52-
RUN ./gradlew :ReactAndroid:downloadBoost :ReactAndroid:downloadDoubleConversion :ReactAndroid:downloadFolly :ReactAndroid:downloadGlog
53-
54-
RUN ./gradlew :ReactAndroid:packageReactNdkLibsForBuck -Pjobs=1
56+
RUN ./gradlew :ReactAndroid:assembleDebug

0 commit comments

Comments
 (0)