Skip to content

Commit 5f171dc

Browse files
authored
chore: bump react-native-test-app to 1.1.2 (#754)
1 parent e1640f1 commit 5f171dc

17 files changed

+258
-390
lines changed

.circleci/config.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ default config for macOS: &macos_defaults
2424
<<: *defaults
2525
resource_class: 'medium'
2626
macos:
27-
xcode: '12.5.1'
27+
xcode: '13.2.1'
2828

2929
config for macOS (android): &macos_defaults_android
3030
<<: *defaults
@@ -40,7 +40,6 @@ default config for android apk builds: &android_defaults
4040
working_directory: ~/async_storage
4141
environment:
4242
- _JAVA_OPTIONS: '-XX:+UnlockExperimentalVMOptions -Xmx2048m'
43-
- GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"'
4443
- BUILD_THREADS: 2
4544

4645
# ==============================
@@ -202,7 +201,10 @@ jobs:
202201
command: ./scripts/ios_e2e.sh 'run_simulator'
203202
- run:
204203
name: Build iOS app
205-
command: yarn build:e2e:ios
204+
command: |
205+
# Workaround for `nvm is not compatible with the "PREFIX" environment variable`
206+
echo > node_modules/react-native/scripts/find-node.sh
207+
yarn build:e2e:ios
206208
- run:
207209
name: Run e2e tests
208210
command: yarn test:e2e:ios

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
runs-on: macos-latest
1111
steps:
1212
- name: Set up Node.js
13-
uses: actions/setup-node@v2.4.1
13+
uses: actions/setup-node@v2.5.1
1414
with:
1515
node-version: 14
1616
- name: Checkout
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v2.4.0
1818
- name: Cache /.cache/yarn
19-
uses: actions/cache@v2
19+
uses: actions/cache@v2.1.7
2020
with:
2121
path: .cache/yarn
2222
key: ${{ hashFiles('yarn.lock') }}
@@ -38,17 +38,17 @@ jobs:
3838
runs-on: windows-2019
3939
steps:
4040
- name: Set up MSBuild
41-
uses: microsoft/setup-msbuild@v1.0.3
41+
uses: microsoft/setup-msbuild@v1.1
4242
- name: Setup VSTest.console.exe
4343
uses: darenm/Setup-VSTest@v1
4444
- name: Set up Node.js
45-
uses: actions/setup-node@v2.4.1
45+
uses: actions/setup-node@v2.5.1
4646
with:
4747
node-version: 14
4848
- name: Checkout
49-
uses: actions/checkout@v2
49+
uses: actions/checkout@v2.4.0
5050
- name: Cache /.cache/yarn
51-
uses: actions/cache@v2
51+
uses: actions/cache@v2.1.7
5252
with:
5353
path: .cache/yarn
5454
key: ${{ hashFiles('yarn.lock') }}
@@ -64,5 +64,5 @@ jobs:
6464
working-directory: example/windows
6565
- name: Build
6666
run: |
67-
MSBuild -t:Rebuild -p:Configuration=Release -p:Platform=x64 -p:BundleEntryFile=index.ts ReactTestApp.sln
67+
MSBuild -t:Rebuild -p:Configuration=Release -p:Platform=x64 -p:BundleEntryFile=index.ts AsyncStorageExample.sln
6868
working-directory: example/windows

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ android/gradlew.bat
3636
# Visual Studio
3737
#
3838
example/windows/.vs
39+
example/windows/*.sln
3940
example/windows/ARM
4041
example/windows/packages
4142
example/windows/x64

example/android/gradle.properties

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,36 @@
77
# For more details on how to configure your build environment visit
88
# http://www.gradle.org/docs/current/userguide/build_environment.html
99

10-
# Specifies the JVM arguments used for the daemon process.
11-
# The setting is particularly useful for tweaking memory settings.
12-
# Default value: -Xmx10248m -XX:MaxPermSize=256m
13-
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
10+
# Specifies the JVM arguments used for the Gradle Daemon. The setting is
11+
# particularly useful for configuring JVM memory settings for build performance.
12+
# This does not affect the JVM settings for the Gradle client VM.
13+
# The default is `-Xmx512m -XX:MaxMetaspaceSize=256m`.
14+
org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
1415

15-
# When configured, Gradle will run in incubating parallel mode.
16-
# This option should only be used with decoupled projects. More details, visit
17-
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18-
# org.gradle.parallel=true
16+
# When configured, Gradle will fork up to org.gradle.workers.max JVMs to execute
17+
# projects in parallel. To learn more about parallel task execution, see the
18+
# section on Gradle build performance:
19+
# https://docs.gradle.org/current/userguide/performance.html#parallel_execution.
20+
# Default is `false`.
21+
#org.gradle.parallel=true
22+
23+
# AndroidX package structure to make it clearer which packages are bundled with the
24+
# Android operating system, and which are packaged with your app's APK
25+
# https://developer.android.com/topic/libraries/support-library/androidx-rn
26+
android.useAndroidX=true
27+
# Automatically convert third-party libraries to use AndroidX
28+
android.enableJetifier=true
29+
30+
# Version of Flipper to use with React Native. Default value is whatever React
31+
# Native defaults to. To disable Flipper, set it to `false`.
32+
#FLIPPER_VERSION=0.125.0
33+
34+
# Uncomment the line below if building react-native from source
35+
#ANDROID_NDK_VERSION=21.4.7075529
1936

2037
# This is an example of how you can change default DB size (6MB) to 10MB
21-
# AsyncStorage_db_size_in_MB=10
38+
#AsyncStorage_db_size_in_MB=10
2239

2340
# Enable dedicated thread pool executor
2441
AsyncStorage_dedicatedExecutor=true
2542
AsyncStorage_useNextStorage=true
26-
27-
android.useAndroidX=true
28-
android.enableJetifier=true
333 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)