Update build config, gitignore after testing
This commit is contained in:
parent
111ca4435e
commit
8e0324dbd8
|
@ -1,37 +1,28 @@
|
||||||
#Android specific
|
# Android specific
|
||||||
bin
|
|
||||||
gen
|
|
||||||
obj
|
|
||||||
libs/armeabi
|
|
||||||
lint.xml
|
lint.xml
|
||||||
local.properties
|
local.properties
|
||||||
release.properties
|
release.properties
|
||||||
ant.properties
|
|
||||||
*.class
|
*.class
|
||||||
*.apk
|
*.apk
|
||||||
|
|
||||||
#Gradle
|
# Gradle
|
||||||
.gradle
|
.gradle
|
||||||
build
|
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
|
target
|
||||||
pom.xml.*
|
pom.xml.*
|
||||||
|
|
||||||
#Eclipse
|
# Eclipse
|
||||||
.project
|
.project
|
||||||
.classpath
|
.classpath
|
||||||
.settings
|
.settings
|
||||||
.metadata
|
.metadata
|
||||||
|
|
||||||
#IntelliJ IDEA
|
# IntelliJ IDEA
|
||||||
.idea
|
.idea
|
||||||
*.iml
|
*.iml
|
||||||
|
|
||||||
#OS Specific
|
# OS Specific
|
||||||
[Tt]humbs.db
|
[Tt]humbs.db
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
|
|
@ -268,10 +268,11 @@ android {
|
||||||
|
|
||||||
dexOptions {
|
dexOptions {
|
||||||
incremental = true
|
incremental = true
|
||||||
// Disable preDexing, causes com.android.dx.cf.iface.ParseException: bad class file magic (cafebabe) or version (0034.0000) on some systems
|
preDexLibraries = true
|
||||||
preDexLibraries = false
|
// dexInProcess requires much RAM, which is not available on all dev systems
|
||||||
|
dexInProcess = false
|
||||||
jumboMode = true
|
jumboMode = true
|
||||||
javaMaxHeapSize "2g"
|
javaMaxHeapSize "4g"
|
||||||
}
|
}
|
||||||
|
|
||||||
packagingOptions {
|
packagingOptions {
|
||||||
|
@ -285,8 +286,6 @@ android {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// apply plugin: 'spoon'
|
|
||||||
|
|
||||||
task jacocoTestReport(type:JacocoReport, dependsOn: "testFdroidDebugUnitTest") {
|
task jacocoTestReport(type:JacocoReport, dependsOn: "testFdroidDebugUnitTest") {
|
||||||
group = "Reporting"
|
group = "Reporting"
|
||||||
description = "Generate Jacoco coverage reports"
|
description = "Generate Jacoco coverage reports"
|
||||||
|
|
Loading…
Reference in New Issue