diff options
| -rw-r--r-- | .gitignore | 21 | ||||
| -rw-r--r-- | OpenKeychain/build.gradle | 9 |
2 files changed, 10 insertions, 20 deletions
diff --git a/.gitignore b/.gitignore index 68f5b5a9e..c7c85bfa0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,37 +1,28 @@ -#Android specific -bin -gen -obj -libs/armeabi +# Android specific lint.xml local.properties release.properties -ant.properties *.class *.apk -#Gradle +# Gradle .gradle build -gradle.properties -# this is in here because the prepare-tests thing modifies it, and we DON'T -# want this to be commited. use git add -f to work on this file. -settings.gradle -#Maven +# Maven target pom.xml.* -#Eclipse +# Eclipse .project .classpath .settings .metadata -#IntelliJ IDEA +# IntelliJ IDEA .idea *.iml -#OS Specific +# OS Specific [Tt]humbs.db .DS_Store diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 04106939c..1ea19cbcb 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -268,10 +268,11 @@ android { dexOptions { incremental = true - // Disable preDexing, causes com.android.dx.cf.iface.ParseException: bad class file magic (cafebabe) or version (0034.0000) on some systems - preDexLibraries = false + preDexLibraries = true + // dexInProcess requires much RAM, which is not available on all dev systems + dexInProcess = false jumboMode = true - javaMaxHeapSize "2g" + javaMaxHeapSize "4g" } packagingOptions { @@ -285,8 +286,6 @@ android { } } -// apply plugin: 'spoon' - task jacocoTestReport(type:JacocoReport, dependsOn: "testFdroidDebugUnitTest") { group = "Reporting" description = "Generate Jacoco coverage reports" |