1) renamed test build type to 'debugTest' because updated gradle

plugin doesn't allow build types to start with 'test'.

2) exclude support-annotations to avoid warning

Closes #3273
// FREEBIE
This commit is contained in:
Rhodey Orbits
2015-06-01 21:44:10 -07:00
committed by Moxie Marlinspike
parent 200fc0c599
commit 5fe7c687f3
3 changed files with 16 additions and 19 deletions

View File

@@ -76,7 +76,11 @@ dependencies {
exclude group: 'org.hamcrest', module: 'hamcrest-core'
}
androidTestCompile ('com.squareup.assertj:assertj-android:1.0.0') {
exclude group: 'org.hamcrest', module: 'hamcrest-core'
exclude group: 'org.hamcrest', module: 'hamcrest-core'
exclude group: 'com.android.support', module: 'support-annotations'
}
androidTestCompile ('com.android.support.test:runner:0.2') {
exclude group: 'com.android.support', module: 'support-annotations'
}
androidTestCompile ('com.android.support.test.espresso:espresso-core:2.1') {
exclude group: 'javax.inject'
@@ -131,7 +135,7 @@ dependencyVerification {
android {
compileSdkVersion 22
buildToolsVersion '22.0.1'
testBuildType "testing"
testBuildType "debugTest"
dexOptions {
javaMaxHeapSize "4g"
@@ -186,8 +190,8 @@ android {
proguardFiles = buildTypes.debug.proguardFiles
signingConfig signingConfigs.release
}
testing.initWith(buildTypes.debug)
testing {
debugTest.initWith(buildTypes.debug)
debugTest {
proguardFile 'proguard-testing.pro'
buildConfigField "String", "PUSH_URL", "\"https://textsecure-service-staging.whispersystems.org\""
}