Commit 7bc11f9e authored by Filipe de Lima Brito's avatar Filipe de Lima Brito

Merge branch 'dependencies' into layout/authentication-screens

parents d9ce041f a5a1b76b
...@@ -7,10 +7,15 @@ ...@@ -7,10 +7,15 @@
machine: machine:
environment: environment:
ANDROID_HOME: /usr/local/android-sdk-linux ANDROID_HOME: /usr/local/android-sdk-linux
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx1536m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError"' GRADLE_OPTS: '-Xmx1024m -Dorg.gradle.jvmargs="-Xmx1024m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError"'
JAVA_OPTS: "-Xms518m -Xmx1024m"
dependencies: dependencies:
pre: pre:
- sudo service mysql stop; sleep 5
- sudo service mongod stop; sleep 5
- sudo killall postgres; sleep 5
- git fetch --tags - git fetch --tags
- echo "sdk.dir="$ANDROID_HOME > local.properties - echo "sdk.dir="$ANDROID_HOME > local.properties
...@@ -23,13 +28,13 @@ dependencies: ...@@ -23,13 +28,13 @@ dependencies:
- echo $API_KEY_STRINGS_BASE64 | base64 --decode > app/src/release/res/values/api_key_strings.xml - echo $API_KEY_STRINGS_BASE64 | base64 --decode > app/src/release/res/values/api_key_strings.xml
- echo y | android update sdk --no-ui --all --filter tools,platform-tools - echo y | android update sdk --no-ui --all --filter tools,platform-tools
- echo y | android update sdk --no-ui --all --filter android-26 - echo y | android update sdk --no-ui --all --filter android-27
- echo y | android update sdk --no-ui --all --filter extra-android-m2repository,extra-android-support - echo y | android update sdk --no-ui --all --filter extra-android-m2repository,extra-android-support
- echo y | android update sdk --no-ui --all --filter extra-google-m2repository,extra-google-google_play_services - echo y | android update sdk --no-ui --all --filter extra-google-m2repository,extra-google-google_play_services
- echo y | android update sdk --no-ui --all --filter build-tools-26.0.2 - echo y | android update sdk --no-ui --all --filter build-tools-27.0.0
cache_directories: cache_directories:
- /usr/local/android-sdk-linux/tools - /usr/local/android-sdk-linux/tools
- /usr/local/android-sdk-linux/build-tools/26.0.2 - /usr/local/android-sdk-linux/build-tools/27.0.0
test: test:
override: override:
......
...@@ -3,12 +3,13 @@ import org.gradle.internal.jvm.Jvm ...@@ -3,12 +3,13 @@ import org.gradle.internal.jvm.Jvm
ext { ext {
versions = [ versions = [
java : JavaVersion.VERSION_1_8, java : JavaVersion.VERSION_1_8,
compileSdk : 26, compileSdk : 27,
targetSdk : 26, targetSdk : 27,
buildTools : '26.0.2', buildTools : '27.0.0',
kotlin : '1.1.51', kotlin : '1.1.51',
// Main dependencies // Main dependencies
support : '26.1.0', support : '27.0.0',
constraintLayout : '1.0.2', constraintLayout : '1.0.2',
autoValue : '1.3', autoValue : '1.3',
moshi : '1.5.0', moshi : '1.5.0',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment