From a968260b188f0a00772997ce500ca760337b6705 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 4 Apr 2016 21:25:44 +0200
Subject: fixing travis

---
 build.gradle | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'build.gradle')

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
-- 
cgit v1.2.3