diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-06-18 21:43:54 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-06-18 21:43:54 +0200 |
| commit | d9c937bbe762736d9f0c45d5ba0083555c8da2e1 (patch) | |
| tree | e5cbd2300622e555283867f39767bf34b9dd5796 /OpenKeychain/build.gradle | |
| parent | e106079b90f7d596a254b223b6e8741fc6d94785 (diff) | |
| parent | 825f37eee4be6a4dc527391e6238668e6d147a36 (diff) | |
| download | open-keychain-d9c937bbe762736d9f0c45d5ba0083555c8da2e1.tar.gz open-keychain-d9c937bbe762736d9f0c45d5ba0083555c8da2e1.tar.bz2 open-keychain-d9c937bbe762736d9f0c45d5ba0083555c8da2e1.zip | |
Merge branch 'master' into improve-file
Diffstat (limited to 'OpenKeychain/build.gradle')
| -rw-r--r-- | OpenKeychain/build.gradle | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 20e5ca594..ba527948a 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'android' -apply plugin: 'android-test' +//apply plugin: 'android-test' sourceSets { - androidTest { - java.srcDir file('src/test/java') + //androidTest { + //java.srcDir file('src/test/java') // configure the set of classes for JUnit tests // include '**/*Test.class' - } + //} } dependencies { @@ -26,10 +26,11 @@ dependencies { compile project(':extern:spongycastle:pkix') compile project(':extern:spongycastle:prov') compile project(':extern:AppMsg:library') + compile project(':extern:SuperToasts:supertoasts') compile project(':extern:dnsjava') // Dependencies for the `instrumentTest` task, make sure to list all your global dependencies here as well - androidTestCompile 'junit:junit:4.10' + androidTestCompile 'junit:junit:4.11' androidTestCompile 'org.robolectric:robolectric:2.3' androidTestCompile 'com.squareup:fest-android:1.0.8' androidTestCompile 'com.google.android:android:4.1.1.4' @@ -47,11 +48,13 @@ dependencies { androidTestCompile project(':extern:spongycastle:pkix') androidTestCompile project(':extern:spongycastle:prov') androidTestCompile project(':extern:AppMsg:library') + androidTestCompile project(':extern:SuperToasts:supertoasts') + } android { compileSdkVersion 19 - buildToolsVersion "19.0.3" + buildToolsVersion "19.1" defaultConfig { minSdkVersion 9 |