Skip to content

Commit

Permalink
chore: bump react-native-test-app to 1.1.2 (react-native-async-storag…
Browse files Browse the repository at this point in the history
  • Loading branch information
tido64 authored Feb 18, 2022
1 parent e1640f1 commit 5f171dc
Show file tree
Hide file tree
Showing 17 changed files with 258 additions and 390 deletions.
8 changes: 5 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ default config for macOS: &macos_defaults
<<: *defaults
resource_class: 'medium'
macos:
xcode: '12.5.1'
xcode: '13.2.1'

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

# ==============================
Expand Down Expand Up @@ -202,7 +201,10 @@ jobs:
command: ./scripts/ios_e2e.sh 'run_simulator'
- run:
name: Build iOS app
command: yarn build:e2e:ios
command: |
# Workaround for `nvm is not compatible with the "PREFIX" environment variable`
echo > node_modules/react-native/scripts/find-node.sh
yarn build:e2e:ios
- run:
name: Run e2e tests
command: yarn test:e2e:ios
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ jobs:
runs-on: macos-latest
steps:
- name: Set up Node.js
uses: actions/setup-node@v2.4.1
uses: actions/setup-node@v2.5.1
with:
node-version: 14
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v2.4.0
- name: Cache /.cache/yarn
uses: actions/cache@v2
uses: actions/cache@v2.1.7
with:
path: .cache/yarn
key: ${{ hashFiles('yarn.lock') }}
Expand All @@ -38,17 +38,17 @@ jobs:
runs-on: windows-2019
steps:
- name: Set up MSBuild
uses: microsoft/setup-msbuild@v1.0.3
uses: microsoft/setup-msbuild@v1.1
- name: Setup VSTest.console.exe
uses: darenm/Setup-VSTest@v1
- name: Set up Node.js
uses: actions/setup-node@v2.4.1
uses: actions/setup-node@v2.5.1
with:
node-version: 14
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v2.4.0
- name: Cache /.cache/yarn
uses: actions/cache@v2
uses: actions/cache@v2.1.7
with:
path: .cache/yarn
key: ${{ hashFiles('yarn.lock') }}
Expand All @@ -64,5 +64,5 @@ jobs:
working-directory: example/windows
- name: Build
run: |
MSBuild -t:Rebuild -p:Configuration=Release -p:Platform=x64 -p:BundleEntryFile=index.ts ReactTestApp.sln
MSBuild -t:Rebuild -p:Configuration=Release -p:Platform=x64 -p:BundleEntryFile=index.ts AsyncStorageExample.sln
working-directory: example/windows
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ android/gradlew.bat
# Visual Studio
#
example/windows/.vs
example/windows/*.sln
example/windows/ARM
example/windows/packages
example/windows/x64
Expand Down
38 changes: 26 additions & 12 deletions example/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,36 @@
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html

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

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# When configured, Gradle will fork up to org.gradle.workers.max JVMs to execute
# projects in parallel. To learn more about parallel task execution, see the
# section on Gradle build performance:
# https://docs.gradle.org/current/userguide/performance.html#parallel_execution.
# Default is `false`.
#org.gradle.parallel=true

# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true

# Version of Flipper to use with React Native. Default value is whatever React
# Native defaults to. To disable Flipper, set it to `false`.
#FLIPPER_VERSION=0.125.0

# Uncomment the line below if building react-native from source
#ANDROID_NDK_VERSION=21.4.7075529

# This is an example of how you can change default DB size (6MB) to 10MB
# AsyncStorage_db_size_in_MB=10
#AsyncStorage_db_size_in_MB=10

# Enable dedicated thread pool executor
AsyncStorage_dedicatedExecutor=true
AsyncStorage_useNextStorage=true

android.useAndroidX=true
android.enableJetifier=true
Binary file modified example/android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 5f171dc

Please sign in to comment.