status-im/react-native-camera
2
0
Fork 0
mirror of https://github.com/status-im/react-native-camera.git synced 2025-02-24 09:48:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Thomas Parslow 2018-05-22 12:50:11 +01:00 committed by GitHub
commit b08bb7e403
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,3 +1,5 @@
#### 1.1.4-6 (2018-05-21)
#### 1.1.3-5 (2018-05-18) #### 1.1.3-5 (2018-05-18)
##### New Features ##### New Features

2
android/build.gradle
View File

@ -54,7 +54,7 @@ dependencies {
def supportLibVersion = rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPORT_LIBRARY_VERSION def supportLibVersion = rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPORT_LIBRARY_VERSION
compileOnly 'com.facebook.react:react-native:+' compileOnly 'com.facebook.react:react-native:+'
implementation 'com.facebook.infer.annotation:infer-annotation:+' compileOnly 'com.facebook.infer.annotation:infer-annotation:+'
implementation "com.google.zxing:core:3.2.1" implementation "com.google.zxing:core:3.2.1"
implementation "com.drewnoakes:metadata-extractor:2.9.1" implementation "com.drewnoakes:metadata-extractor:2.9.1"
implementation "com.google.android.gms:play-services-vision:$googlePlayServicesVersion" implementation "com.google.android.gms:play-services-vision:$googlePlayServicesVersion"

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "react-native-camera", "name": "react-native-camera",
"version": "1.1.3", "version": "1.1.4",
"lockfileVersion": 1, "lockfileVersion": 1,
"dependencies": { "dependencies": {
"ansi-escapes": { "ansi-escapes": {

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "react-native-camera", "name": "react-native-camera",
"description": "A Camera component for React Native. Also reads barcodes.", "description": "A Camera component for React Native. Also reads barcodes.",
"version": "1.1.3", "version": "1.1.4",
"author": "Lochlan Wansbrough <lochie@live.com> (http://lwansbrough.com)", "author": "Lochlan Wansbrough <lochie@live.com> (http://lwansbrough.com)",
"collective": { "collective": {
"type": "opencollective", "type": "opencollective",