diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-21 03:59:16 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-21 03:59:28 +0200 |
| commit | f560bc9317357a755b5862c1eec142b7c4665c0a (patch) | |
| tree | 0e919ae510251a3dfad9be96d3625e856d9eb594 | |
| parent | 527c3e93f8c570096f52d8ae5bc3ce68bef96269 (diff) | |
| download | open-keychain-f560bc9317357a755b5862c1eec142b7c4665c0a.tar.gz open-keychain-f560bc9317357a755b5862c1eec142b7c4665c0a.tar.bz2 open-keychain-f560bc9317357a755b5862c1eec142b7c4665c0a.zip | |
forgot to move test classpath out of root project
| -rw-r--r-- | OpenKeychain-Test/build.gradle | 14 | ||||
| -rw-r--r-- | OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringCanonicalizeTest.java (renamed from OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringTest.java) | 2 | ||||
| -rw-r--r-- | OpenKeychain/build.gradle | 1 | ||||
| -rw-r--r-- | build.gradle | 5 |
4 files changed, 15 insertions, 7 deletions
diff --git a/OpenKeychain-Test/build.gradle b/OpenKeychain-Test/build.gradle index a00268c59..a98a79dc1 100644 --- a/OpenKeychain-Test/build.gradle +++ b/OpenKeychain-Test/build.gradle @@ -1,3 +1,17 @@ +buildscript { + repositories { + mavenCentral() + // need this for com.novoda:gradle-android-test-plugin:0.9.9-SNAPSHOT below (0.9.3 in repos doesn't work!) + // run ./install-custom-gradle-test-plugin.sh to pull the thing into the local repository + mavenLocal() + } + + dependencies { + // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information + classpath 'com.novoda:gradle-android-test-plugin:0.9.9-SNAPSHOT' + } +} + apply plugin: 'java' apply plugin: 'android-test' apply plugin: 'jacoco' diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringCanonicalizeTest.java index 496850eb7..6f3cf31b5 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringTest.java +++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/tests/UncachedKeyringCanonicalizeTest.java @@ -28,7 +28,7 @@ import java.util.Iterator; @RunWith(RobolectricTestRunner.class) @org.robolectric.annotation.Config(emulateSdk = 18) // Robolectric doesn't yet support 19 -public class UncachedKeyringTest { +public class UncachedKeyringCanonicalizeTest { static UncachedKeyRing staticRing; static int totalPackets; diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index a6c01543c..11fa54a57 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'android' -apply plugin: 'robolectric' dependencies { // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information diff --git a/build.gradle b/build.gradle index 698b4cd37..05e90eb17 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,11 @@ buildscript { repositories { mavenCentral() - // need this for com.novoda:gradle-android-test-plugin:0.9.9-SNAPSHOT below (0.9.3 in repos doesn't work!) - // run ./install-custom-gradle-test-plugin.sh to pull the thing into the local repository - mavenLocal() } dependencies { // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information classpath 'com.android.tools.build:gradle:0.12.0' - classpath 'org.robolectric:robolectric-gradle-plugin:0.11.0' - classpath 'com.novoda:gradle-android-test-plugin:0.9.9-SNAPSHOT' } } |