Commit e5fa58f4 authored by Tiago Cunha's avatar Tiago Cunha

Improves CI build config

Disables predexing
Better handle memory options
parent 4a9b3391
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
machine: machine:
environment: environment:
ANDROID_HOME: /usr/local/android-sdk-linux ANDROID_HOME: /usr/local/android-sdk-linux
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
dependencies: dependencies:
pre: pre:
......
...@@ -17,6 +17,8 @@ ext { ...@@ -17,6 +17,8 @@ ext {
rxJava = 'io.reactivex:rxjava:1.2.2' rxJava = 'io.reactivex:rxjava:1.2.2'
boltsTask = 'com.parse.bolts:bolts-tasks:1.4.0' boltsTask = 'com.parse.bolts:bolts-tasks:1.4.0'
timber = 'com.jakewharton.timber:timber:4.3.1' timber = 'com.jakewharton.timber:timber:4.3.1'
preDexLibs = !"true".equals(System.getenv("CI"))
} }
subprojects { project -> subprojects { project ->
...@@ -30,4 +32,14 @@ subprojects { project -> ...@@ -30,4 +32,14 @@ subprojects { project ->
} }
} }
} }
}
subprojects {
project.plugins.whenPluginAdded { plugin ->
if ("com.android.build.gradle.AppPlugin".equals(plugin.class.name)) {
project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
} else if ("com.android.build.gradle.LibraryPlugin".equals(plugin.class.name)) {
project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
}
}
} }
\ No newline at end of file
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