moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2025-02-20 04:31:49 -05:00
Code Issues Releases Wiki Activity

Revert "disable predexing on travis"

Browse Source 
This reverts commit ad063d00ccbfc4a9c72c707d11b13a2da0912d28.
This commit is contained in:
Daniel Gultsch 2016-02-23 14:33:03 +01:00
parent ad063d00cc
commit 20eebe638b
2 changed files with 86 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -16,4 +16,4 @@ android:
licenses: licenses:
- '.+' - '.+'
script: script:
- ./gradlew assembleFreeRelease -PdisablePreDex - ./gradlew assembleFreeRelease

8
build.gradle
View File

@ -106,14 +106,6 @@ android {
} }
} }
project.plugins.whenPluginAdded { plugin ->
if ("com.android.build.gradle.AppPlugin".equals(plugin.class.name)) {
project.android.dexOptions.preDexLibraries = !project.hasProperty('disablePreDex')
} else if ("com.android.build.gradle.LibraryPlugin".equals(plugin.class.name)) {
project.android.dexOptions.preDexLibraries = !project.hasProperty('disablePreDex')
}
}
} }
packagingOptions { packagingOptions {