aboutsummaryrefslogtreecommitdiffstats
path: root/app/build.gradle
diff options
context:
space:
mode:
Diffstat (limited to 'app/build.gradle')
-rw-r--r--app/build.gradle17
1 files changed, 16 insertions, 1 deletions
diff --git a/app/build.gradle b/app/build.gradle
index e791fc9..60e76f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,7 +55,7 @@ android {
}
testApplicationId "org.connectbot.tests"
- testInstrumentationRunner "android.test.InstrumentationTestRunner"
+ testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
signingConfigs {
@@ -66,6 +66,16 @@ android {
compile "com.android.support:support-v4:22.2.1"
compile "com.android.support:appcompat-v7:22.2.1"
compile "com.android.support:design:22.2.1"
+
+ androidTestCompile('com.android.support.test:runner:0.3') {
+ exclude module: "support-annotations"
+ }
+ androidTestCompile('com.android.support.test:rules:0.3') {
+ exclude module: "support-annotations"
+ }
+ androidTestCompile('com.android.support.test.espresso:espresso-core:2.2') {
+ exclude module: "support-annotations"
+ }
}
buildTypes {
@@ -83,6 +93,11 @@ android {
testCoverageEnabled true
}
}
+
+ packagingOptions {
+ exclude 'META-INF/LICENSE.txt'
+ exclude 'LICENSE.txt'
+ }
}
def getGitDescription = { ->