diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-12 23:57:21 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-13 00:27:40 +0200 |
| commit | ca4774fd622131581e7f700a12594ad6fe1263b1 (patch) | |
| tree | 10ad0e6676454a435d45b7dc12d1fd9148aab6a0 /OpenKeychain/build.gradle | |
| parent | 073433fa747d698c6666081b2ee312062ecf2115 (diff) | |
| parent | 70d454785fc87dfaf8731a6eb7cebe3fc0056e7a (diff) | |
| download | open-keychain-ca4774fd622131581e7f700a12594ad6fe1263b1.tar.gz open-keychain-ca4774fd622131581e7f700a12594ad6fe1263b1.tar.bz2 open-keychain-ca4774fd622131581e7f700a12594ad6fe1263b1.zip | |
Merge remote-tracking branch 'origin/master' into canonicalize
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/AndroidManifest.xml
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
OpenKeychain/src/main/res/values/strings.xml
settings.gradle
Diffstat (limited to 'OpenKeychain/build.gradle')
| -rw-r--r-- | OpenKeychain/build.gradle | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 4050ac139..32b60e915 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 { @@ -27,6 +27,7 @@ dependencies { 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' @@ -53,7 +54,7 @@ dependencies { android { compileSdkVersion 19 - buildToolsVersion "19.0.3" + buildToolsVersion "19.1" defaultConfig { minSdkVersion 9 |