Skip to content

Commit ca610b4

Browse files
authored
Merge pull request microsoft#1894 from amgleitman/0.72-merge-before-monorepo
Merge to commit before monorepo change, reimplemented
2 parents db882e9 + fdab6df commit ca610b4

File tree

919 files changed

+32318
-13352
lines changed

Some content is hidden

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

919 files changed

+32318
-13352
lines changed

.ado/templates/apple-tools-setup.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
steps:
22
- task: NodeTool@0
33
inputs:
4-
versionSource: 'fromFile'
5-
versionFilePath: '.node-version'
4+
versionSpec: '18.x'
65

76
- task: UseRubyVersion@0
87
inputs:

.babelrc

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"presets": [
3+
"module:metro-react-native-babel-preset"
4+
],
5+
"plugins": [
6+
"babel-plugin-transform-flow-enums"
7+
]
8+
}

.circleci/Dockerfiles/Dockerfile.android

+4-10
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
# Disabling this is okay because per (Github#774) this test, which is redundant to Azure Devops test,
2525
# fails in the fork because of Microsoft's V8 upgrade to Android
2626
#
27-
#FROM reactnativecommunity/react-native-android:6.1
27+
#FROM reactnativecommunity/react-native-android:7.0
2828

2929
LABEL Description="React Native Android Test Image"
3030
LABEL maintainer="Héctor Ramos <[email protected]>"
3131

3232
ARG BUCK_BUILD
3333
# set default environment variables
34-
ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
34+
ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dfile.encoding=utf-8 -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
3535
ENV KOTLIN_HOME="third-party/kotlin"
3636

3737
ADD .buckconfig /app/.buckconfig
@@ -44,7 +44,7 @@ ADD React /app/React
4444
ADD keystores /app/keystores
4545
ADD packages/react-native-codegen /app/packages/react-native-codegen
4646
ADD tools /app/tools
47-
add scripts /app/scripts
47+
ADD scripts /app/scripts
4848

4949
# add third party dependencies
5050
ADD Folly /app/Folly
@@ -55,13 +55,7 @@ ADD jsc /app/jsc
5555
# set workdir
5656
WORKDIR /app
5757

58-
RUN scripts/download-kotlin-compiler-with-buck.sh
59-
60-
RUN buck fetch ReactAndroid/src/test/java/com/facebook/react/modules
61-
RUN buck fetch ReactAndroid/src/main/java/com/facebook/react
62-
RUN buck fetch ReactAndroid/src/main/java/com/facebook/react/shell
63-
RUN buck fetch ReactAndroid/src/test/...
64-
RUN buck fetch ReactAndroid/src/androidTest/...
58+
RUN scripts/buck/buck_fetch.sh
6559

6660
RUN buck build ReactAndroid/src/main/java/com/facebook/react
6761
RUN buck build ReactAndroid/src/main/java/com/facebook/react/shell

0 commit comments

Comments
 (0)