aboutsummaryrefslogtreecommitdiffstats
path: root/build.gradle
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-04-04 21:25:44 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-04-04 21:25:44 +0200
commita968260b188f0a00772997ce500ca760337b6705 (patch)
treea9c0a882d75fb468ae00d5b96dcd77c4f5ae0f39 /build.gradle
parent0385e3a8d62ebe68a8c40a75ea95d3726d3839f3 (diff)
fixing travis
Diffstat (limited to '')
-rw-r--r--build.gradle11
1 files changed, 11 insertions, 0 deletions
diff --git a/build.gradle b/build.gradle
index bcdff444..5a05e95b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,6 +51,12 @@ dependencies {
playstoreCompile 'com.google.android.gms:play-services-gcm:8.4.0'
}
+ext {
+ travisBuild = System.getenv("TRAVIS") == "true"
+ // allows for -Dpre-dex=false to be set
+ preDexEnabled = "true".equals(System.getProperty("pre-dex", "true"))
+}
+
android {
compileSdkVersion 23
buildToolsVersion "23.0.2"
@@ -64,6 +70,11 @@ android {
applicationId "eu.siacs.conversations"
}
+ dexOptions {
+ // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
+ preDexLibraries = preDexEnabled && !travisBuild
+ }
+
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7