From 2abe2c43e2b7cf99dd2aaa5cff3e1ac6c646d678 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Thu, 16 Jul 2015 16:38:51 -0700
Subject: 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.
---
 app/build.gradle | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'app/build.gradle')

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
-- 
cgit v1.2.3