Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Wallet] Set default gradle properties #1629

Merged
merged 6 commits into from
Nov 14, 2019
Merged

[Wallet] Set default gradle properties #1629

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
703baad
Set default gradle properties
jeanregisser Nov 7, 2019
878f684
Merge remote-tracking branch 'origin/master' into jeanregisser/set-de…
jeanregisser Nov 13, 2019
768ca7a
Testing reduced jvm options since we're setting them in
jeanregisser Nov 13, 2019
3b8ffab
Merge branch 'master' into jeanregisser/set-default-gradle-properties
jeanregisser Nov 14, 2019
d77a699
Merge branch 'master' into jeanregisser/set-default-gradle-properties
annakaz Nov 14, 2019
bcf3475
Merge refs/heads/master into jeanregisser/set-default-gradle-properties
Nov 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ reference:
shell: /bin/bash --login -eo pipefail
environment:
TERM: dumb
_JAVA_OPTIONS: "-Xmx7g -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.configureondemand=true -Dorg.gradle.jvmargs="-Xmx6g -XX:MaxPermSize=3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"'
_JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.configureondemand=true'

defaults: &defaults
working_directory: ~/app
Expand All @@ -28,8 +28,8 @@ android-defaults: &android-defaults
docker:
- image: circleci/android:api-28-node
environment:
_JAVA_OPTIONS: "-Xmx7g -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.configureondemand=true -Dorg.gradle.jvmargs="-Xmx6g -XX:MaxPermSize=3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"'
_JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.configureondemand=true'

e2e-defaults: &e2e-defaults
<<: *defaults
Expand Down
3 changes: 2 additions & 1 deletion packages/mobile/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@
# 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
org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError

# 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
org.gradle.parallel=true

CELO_RELEASE_STORE_FILE=celo-release-key.keystore
CELO_RELEASE_KEY_ALIAS=celo-key-alias
Expand Down