From 0927bd5b010066b596c4d654ba5847407624d2bc Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Fri, 15 Apr 2016 17:51:22 +0100
Subject: [PATCH] Moved zxing dependency to briar-android.
---
briar-android/build.gradle | 2 ++
briar-core/build.gradle | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/briar-android/build.gradle b/briar-android/build.gradle
index 7e79c0dffb..89484f4a1f 100644
--- a/briar-android/build.gradle
+++ b/briar-android/build.gradle
@@ -31,6 +31,7 @@ dependencies {
compile "info.guardianproject.panic:panic:0.5"
compile "info.guardianproject.trustedintents:trustedintents:0.2"
compile "de.hdodenhof:circleimageview:2.0.0"
+ compile "com.google.zxing:core:3.2.1"
apt 'com.google.dagger:dagger-compiler:2.0.2'
provided 'javax.annotation:jsr250-api:1.0'
}
@@ -47,6 +48,7 @@ dependencyVerification {
'info.guardianproject.panic:panic:a7ed9439826db2e9901649892cf9afbe76f00991b768d8f4c26332d7c9406cb2',
'info.guardianproject.trustedintents:trustedintents:6221456d8821a8d974c2acf86306900237cf6afaaa94a4c9c44e161350f80f3e',
'de.hdodenhof:circleimageview:c76d936395b50705a3f98c9220c22d2599aeb9e609f559f6048975cfc1f686b8',
+ 'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259',
]
}
diff --git a/briar-core/build.gradle b/briar-core/build.gradle
index 94452e1e08..7fe4201a76 100644
--- a/briar-core/build.gradle
+++ b/briar-core/build.gradle
@@ -13,14 +13,12 @@ dependencies {
compile fileTree(dir: 'libs', include: '*.jar')
compile "com.madgag.spongycastle:core:1.54.0.0"
compile "com.h2database:h2:1.4.190"
- compile "com.google.zxing:core:3.2.1"
}
dependencyVerification {
verify = [
'com.madgag.spongycastle:core:1e7fa4b19ccccd1011364ab838d0b4702470c178bbbdd94c5c90b2d4d749ea1e',
'com.h2database:h2:23ba495a07bbbb3bd6c3084d10a96dad7a23741b8b6d64b213459a784195a98c',
- 'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259',
]
}
--
GitLab