Revert "disable predexing on travis"

This reverts commit ad063d00cc.
2016-02-23 14:33:03 +01:00 · 2016-02-23 14:33:03 +01:00 · 20eebe638b
parent ad063d00cc
commit 20eebe638b
2 changed files with 86 additions and 94 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -16,4 +16,4 @@ android:
  licenses:
    - '.+'
 script:
-    - ./gradlew assembleFreeRelease -PdisablePreDex
+    - ./gradlew assembleFreeRelease
--- a/build.gradle
+++ b/build.gradle
@ -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 {