Merge branch 'feature/barcodeReader' of ssh://tapir/data/depots/pilstock/PillDroid into feature/barcodeReader

This commit is contained in:
Jacques Foucry 2016-05-29 21:24:13 +02:00
commit 0f31419ec9

View file

@ -19,6 +19,13 @@ android {
}
}
repositories {
mavenCentral()
maven {
url "https://raw.github.com/embarkmobile/zxing-android-minimal/mvn-repo/maven-repository/"
}
}
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
testCompile 'junit:junit:4.12'
@ -26,4 +33,8 @@ dependencies {
compile 'com.android.support:support-v4:23.3.0'
compile 'com.android.support:recyclerview-v7:23.3.0'
compile 'com.android.support:design:23.3.0'
compile 'com.embarkmobile:zxing-android-minimal:2.0@aar'
compile 'com.embarkmobile:zxing-android-legacy:2.0.0@aar'
compile 'com.embarkmobile:zxing-android-integration:2.0.0@aar'
compile 'com.google.zxing:core:3.0.1'
}