moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-12-17 21:22:24 -05:00
Code Issues Releases Wiki Activity

fixing travis

Browse Source
This commit is contained in:
Daniel Gultsch 2016-04-04 21:25:44 +02:00
parent 0385e3a8d6
commit a968260b18
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -4,10 +4,6 @@ android:
- platform-tools - platform-tools
- tools - tools
- build-tools-23.0.2 - 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 - build-tools-19.1.0
- android-23 - android-23
- extra-android-m2repository - extra-android-m2repository

11
build.gradle
View File

@ -51,6 +51,12 @@ dependencies {
playstoreCompile 'com.google.android.gms:play-services-gcm:8.4.0' 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 { android {
compileSdkVersion 23 compileSdkVersion 23
buildToolsVersion "23.0.2" buildToolsVersion "23.0.2"
@ -64,6 +70,11 @@ android {
applicationId "eu.siacs.conversations" applicationId "eu.siacs.conversations"
} }
dexOptions {
// Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
preDexLibraries = preDexEnabled && !travisBuild
}
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7 sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7