From 7a5121894ee0ede4f20a6d029e4880c68cd643b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 11 Jun 2015 00:35:58 +0200
Subject: [PATCH] Remove unused deps, fix travis

---
 .travis.yml               | 3 +--
 OpenKeychain/build.gradle | 7 ++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4bc9d776a..9ddd6e152 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,5 @@ before_install:
     - ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --no-ui --all --force --filter build-tools-22.0.1,build-tools-21.1.2,build-tools-21.1.1,build-tools-19.1.0,android-22,android-21,android-19,platform-tools,extra-android-support,extra-android-m2repository
 install: echo "Installation done"
 script:
-    - ./gradlew assemble -S -q
-    - ./gradlew --info OpenKeychain-Test:testDebug
+    - ./gradlew testDebug --continue --info
 
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index 82c56f5c0..081d87462 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -11,15 +11,12 @@ dependencies {
     compile 'com.android.support:recyclerview-v7:22.1.0'
     compile 'com.android.support:cardview-v7:22.1.0'
     
-    // Local Unit tests with Robolectric
+    // Unit tests in the local JVM with Robolectric
     // https://developer.android.com/training/testing/unit-testing/local-unit-tests.html
     // https://github.com/nenick/AndroidStudioAndRobolectric
     // http://www.vogella.com/tutorials/Robolectric/article.html
     testCompile 'junit:junit:4.12'
-    testCompile 'org.hamcrest:hamcrest-core:1.1'
-    testCompile 'org.hamcrest:hamcrest-library:1.1'
-    testCompile 'org.hamcrest:hamcrest-integration:1.1'
-    testCompile "org.robolectric:robolectric:3.0-rc3"
+    testCompile 'org.robolectric:robolectric:3.0-rc3'
 
     // UI testing with Espresso
     androidTestCompile 'com.android.support.test:runner:0.2'