narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Revert "disable predexing on travis"

Browse source 
This reverts commit ad063d00cc.
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 {