From c0378ed2db7243395197a7c0df4f324e098db446 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Thu, 27 Aug 2015 15:57:42 -0700 Subject: Add dummy Android test This is the start of the regression tests to make sure stuff like Local connections not working doesn't happen again. --- app/build.gradle | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'app/build.gradle') 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 = { -> -- cgit v1.2.3