aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/build.gradle
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-01-14 19:14:30 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-01-14 19:14:30 +0100
commit85b6669625c9b94972fb03ec0de2da689c24d299 (patch)
tree79755cc6c865a1f7b71be352e3126dbdfd9560a6 /OpenKeychain/build.gradle
parent9b093c6d73214879bee3c1b2162cf1f15c224a19 (diff)
downloadopen-keychain-85b6669625c9b94972fb03ec0de2da689c24d299.tar.gz
open-keychain-85b6669625c9b94972fb03ec0de2da689c24d299.tar.bz2
open-keychain-85b6669625c9b94972fb03ec0de2da689c24d299.zip
Integrate QR Code library instead of requiring the app to be installed, also due to security reasons
Diffstat (limited to 'OpenKeychain/build.gradle')
-rw-r--r--OpenKeychain/build.gradle7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index 6c78c3aea..21482340a 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -10,8 +10,6 @@ dependencies {
compile project(':extern:openkeychain-api-lib')
compile project(':extern:html-textview')
compile project(':extern:StickyListHeaders:library')
- compile project(':extern:zxing-qr-code')
- compile project(':extern:zxing-android-integration')
compile project(':extern:spongycastle:core')
compile project(':extern:spongycastle:pg')
compile project(':extern:spongycastle:pkix')
@@ -22,6 +20,11 @@ dependencies {
compile project(':extern:TokenAutoComplete:library')
compile project(':extern:safeslinger-exchange')
compile project(':extern:android-lockpattern:code')
+
+ // TODO: include as submodule?:
+ compile 'com.journeyapps:zxing-android-embedded:2.0.1@aar'
+ compile 'com.journeyapps:zxing-android-integration:2.0.1@aar'
+ compile 'com.google.zxing:core:3.0.1'
}
android {