diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-06-23 13:44:25 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-06-23 13:44:25 +0200 |
| commit | e8b96d1035aebf9ac7cb642868705736735849b1 (patch) | |
| tree | 392cb1729dcbd287f3e342205b460913559464ad | |
| parent | 514a4c668b0e9afcfcb45832bba05799be621b95 (diff) | |
| download | open-keychain-e8b96d1035aebf9ac7cb642868705736735849b1.tar.gz open-keychain-e8b96d1035aebf9ac7cb642868705736735849b1.tar.bz2 open-keychain-e8b96d1035aebf9ac7cb642868705736735849b1.zip | |
Disable pre-dexing, causes exceptions on some systems
| -rw-r--r-- | OpenKeychain/build.gradle | 6 | ||||
| -rw-r--r-- | build.gradle | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index ff6f603f4..c18c4865c 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -29,7 +29,6 @@ dependencies { testCompile 'com.squareup:fest-android:1.0.8' testCompile 'com.google.android:android:4.1.1.4' // compile dependencies are automatically also included in testCompile - } android { @@ -79,6 +78,11 @@ android { htmlReport true htmlOutput file("lint-report.html") } + + // Disable preDexing, causes com.android.dx.cf.iface.ParseException: bad class file magic (cafebabe) or version (0034.0000) on some systems + dexOptions { + preDexLibraries = false + } } // NOTE: This disables Lint! diff --git a/build.gradle b/build.gradle index e0da6b52f..fa6c7278e 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { dependencies { // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information classpath 'com.android.tools.build:gradle:0.11.1' - classpath 'org.robolectric:robolectric-gradle-plugin:0.11.0' + classpath 'org.robolectric:robolectric-gradle-plugin:0.11.0' } } |