disable predexing on travis

This commit is contained in:
Daniel Gultsch 2016-02-23 14:25:13 +01:00
parent beb216c300
commit ad063d00cc
2 changed files with 94 additions and 86 deletions

View file

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

View file

@ -106,6 +106,14 @@ 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 {