diff options
author | Kenny Root <kenny@the-b.org> | 2015-07-16 16:38:51 -0700 |
---|---|---|
committer | Kenny Root <kenny@the-b.org> | 2015-07-16 16:52:22 -0700 |
commit | 2abe2c43e2b7cf99dd2aaa5cff3e1ac6c646d678 (patch) | |
tree | 760ca1a479eacc14fb597dca4541460486687166 /app/build.gradle | |
parent | c22178e05b672f5c2beb498f4beb936f8d6acc45 (diff) | |
download | connectbot-2abe2c43e2b7cf99dd2aaa5cff3e1ac6c646d678.tar.gz connectbot-2abe2c43e2b7cf99dd2aaa5cff3e1ac6c646d678.tar.bz2 connectbot-2abe2c43e2b7cf99dd2aaa5cff3e1ac6c646d678.zip |
Update to Robolectric 3.0
This has better support for Android, so we don't need the separate
project here anymore. Simply move all the existing robolectric-based
tests to the app directory and remove the robolectric-tests subproject.
Diffstat (limited to 'app/build.gradle')
-rw-r--r-- | app/build.gradle | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/build.gradle b/app/build.gradle index a0fec85..9118576 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,7 +41,7 @@ android { buildTypes { release { minifyEnabled true - proguardFiles 'proguard.cfg' + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg' if (project.hasProperty('keystorePassword')) { signingConfig signingConfigs.release @@ -54,6 +54,14 @@ android { } } +dependencies { + testCompile 'junit:junit:4.12' + testCompile('org.robolectric:robolectric:3.0') { + exclude group: 'commons-logging', module: 'commons-logging' + exclude group: 'org.apache.httpcomponents', module: 'httpclient' + } +} + if (project.hasProperty('keystorePassword')) { android.signingConfigs.release.storeFile file(keystoreFile) android.signingConfigs.release.storePassword keystorePassword |