aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/build.gradle
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-06-03 13:06:49 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-06-03 13:06:49 +0200
commit84d03dd5142902e013d52dca256d0a66d551ee6e (patch)
tree8560088fe57ab8454fa8c35e21bbff7591085fb5 /OpenKeychain/build.gradle
parent39997a802ec2a56039d216cd44c3ec89ab75c1a2 (diff)
parent4a47126f05ee53c9d09f46b9445918230937ccf2 (diff)
downloadopen-keychain-84d03dd5142902e013d52dca256d0a66d551ee6e.tar.gz
open-keychain-84d03dd5142902e013d52dca256d0a66d551ee6e.tar.bz2
open-keychain-84d03dd5142902e013d52dca256d0a66d551ee6e.zip
Merge pull request #643 from open-keychain/v/dev
wrap bouncycastle objects and don't use them in android-related code
Diffstat (limited to 'OpenKeychain/build.gradle')
-rw-r--r--OpenKeychain/build.gradle59
1 files changed, 23 insertions, 36 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index 090a7a2bf..11dd7f21c 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -1,9 +1,11 @@
apply plugin: 'android'
+apply plugin: 'android-test'
sourceSets {
- testLocal {
+ androidTest {
java.srcDir file('src/test/java')
- resources.srcDir file('src/test/resources')
+ // configure the set of classes for JUnit tests
+ // include '**/*Test.class'
}
}
@@ -23,24 +25,25 @@ dependencies {
compile project(':extern:spongycastle:prov')
compile project(':extern:AppMsg:library')
- // Dependencies for the `testLocal` task, make sure to list all your global dependencies here as well
- testLocalCompile 'junit:junit:4.11'
- testLocalCompile 'org.robolectric:robolectric:2.2'
- testLocalCompile 'com.google.android:android:4.1.1.4'
- testLocalCompile 'com.android.support:support-v4:19.1.0'
- testLocalCompile 'com.android.support:appcompat-v7:19.1.0'
- testLocalCompile project(':extern:openpgp-api-lib')
- testLocalCompile project(':extern:openkeychain-api-lib')
- testLocalCompile project(':extern:html-textview')
- testLocalCompile project(':extern:StickyListHeaders:library')
- testLocalCompile project(':extern:AndroidBootstrap:AndroidBootstrap')
- testLocalCompile project(':extern:zxing-qr-code')
- testLocalCompile project(':extern:zxing-android-integration')
- testLocalCompile project(':extern:spongycastle:core')
- testLocalCompile project(':extern:spongycastle:pg')
- testLocalCompile project(':extern:spongycastle:pkix')
- testLocalCompile project(':extern:spongycastle:prov')
- testLocalCompile project(':extern:AppMsg:library')
+ // Dependencies for the `instrumentTest` task, make sure to list all your global dependencies here as well
+ androidTestCompile 'junit:junit:4.10'
+ androidTestCompile 'org.robolectric:robolectric:2.1.+'
+ androidTestCompile 'com.squareup:fest-android:1.0.+'
+ androidTestCompile 'com.google.android:android:4.1.1.4'
+ androidTestCompile 'com.android.support:support-v4:19.1.0'
+ androidTestCompile 'com.android.support:appcompat-v7:19.1.0'
+ androidTestCompile project(':extern:openpgp-api-lib')
+ androidTestCompile project(':extern:openkeychain-api-lib')
+ androidTestCompile project(':extern:html-textview')
+ androidTestCompile project(':extern:StickyListHeaders:library')
+ androidTestCompile project(':extern:AndroidBootstrap:AndroidBootstrap')
+ androidTestCompile project(':extern:zxing-qr-code')
+ androidTestCompile project(':extern:zxing-android-integration')
+ androidTestCompile project(':extern:spongycastle:core')
+ androidTestCompile project(':extern:spongycastle:pg')
+ androidTestCompile project(':extern:spongycastle:pkix')
+ androidTestCompile project(':extern:spongycastle:prov')
+ androidTestCompile project(':extern:AppMsg:library')
}
android {
@@ -92,20 +95,6 @@ android {
}
}
-task localTest(type: Test, dependsOn: assemble) {
- testClassesDir = sourceSets.testLocal.output.classesDir
-
- android.sourceSets.main.java.srcDirs.each { dir ->
- def buildDir = dir.getAbsolutePath().split("\\" + File.separator)
- buildDir = (buildDir[0..(buildDir.length - 4)] + ['build', 'classes', 'debug']).join("\\" + File.separator)
-
- sourceSets.testLocal.compileClasspath += files(buildDir)
- sourceSets.testLocal.runtimeClasspath += files(buildDir)
- }
-
- classpath = sourceSets.testLocal.runtimeClasspath
-}
-
// NOTE: This disables Lint!
tasks.whenTaskAdded { task ->
if (task.name.equals("lint")) {
@@ -113,5 +102,3 @@ tasks.whenTaskAdded { task ->
}
}
-// NOTE: tests disabled!
-//check.dependsOn localTest