diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-04-04 21:19:21 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-04-04 21:19:21 +0200 |
| commit | a830c77753138c761f9f728b3c947c104019b129 (patch) | |
| tree | a9c0a882d75fb468ae00d5b96dcd77c4f5ae0f39 | |
| parent | 706a23dcb68b4b846180c5d5072025802735db51 (diff) | |
fixing travistravis-fixes
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | build.gradle | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 60df6eca..9d37a4f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,9 @@ language: android -sudo: required android: components: - platform-tools - tools - build-tools-23.0.2 - - build-tools-23.0.1 - - build-tools-23.0.0 - - build-tools-22.0.1 - - build-tools-21.1.2 - build-tools-19.1.0 - android-23 - extra-android-m2repository 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 |