Skip to content

Commit

Permalink
Merge branch 'release/4.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
awesomejerry committed Mar 14, 2017
2 parents 0f4d203 + 936cc46 commit 604c49b
Show file tree
Hide file tree
Showing 5 changed files with 3,266 additions and 15 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ A QR Code generator for React Native based on react-native-svg and javascript-qr
* Easily render QR code images
* Optionally embed a logotype

<img src="./screenshot/android.png" width="150">
<img src="./screenshot/ios.png" width="150">
<img src="./screenshot/logo.png" width="150">
<img src="https://raw.githubusercontent.com/awesomejerry/react-native-qrcode-svg/master/screenshot/android.png" width="150">
<img src="https://raw.githubusercontent.com/awesomejerry/react-native-qrcode-svg/master/screenshot/ios.png" width="150">
<img src="https://raw.githubusercontent.com/awesomejerry/react-native-qrcode-svg/master/screenshot/logo.png" width="150">

## Installation

Expand Down
2 changes: 0 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ machine:
version: 6.9.1

dependencies:
pre:
- npm install react-native-svg@^4.3.1
override:
- npm install

Expand Down
23 changes: 13 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"name": "react-native-qrcode-svg",
"version": "3.1.1",
"version": "4.0.0",
"description": "A QR Code generator for React Native based on react-native-svg and javascript-qrcode.",
"main": "index.js",
"scripts": {
"test": "jest",
"test-update": "npm run test -- --updateSnapshot",
"2npm": "publish"
},
"repository": {
Expand All @@ -23,19 +24,21 @@
},
"homepage": "https://github.com/awesomejerry/react-native-qrcode-svg#readme",
"peerDependencies": {
"react-native-svg": "^4.3.1"
"react": "^15.4.2",
"react-native": "^0.42.0",
"react-native-svg": "^5.1.5"
},
"dependencies": {
"javascript-qrcode": "git+https://git@github.com/awesomejerry/javascript-qrcode.git"
},
"devDependencies": {
"babel-jest": "^16.0.0",
"babel-plugin-transform-class-properties": "^6.18.0",
"babel-preset-es2015": "^6.18.0",
"babel-preset-react": "^6.16.0",
"jest": "^16.0.2",
"publish": "0.6.0",
"react": "15.3.2",
"react-test-renderer": "^15.3.2"
"babel-jest": "^19.0.0",
"babel-plugin-transform-class-properties": "^6.23.0",
"babel-preset-es2015": "^6.24.0",
"babel-preset-react": "^6.23.0",
"jest": "^19.0.2",
"publish": "^0.6.0",
"react": "^15.4.2",
"react-test-renderer": "^15.4.2"
}
}
2 changes: 2 additions & 0 deletions src/__tests__/__snapshots__/QRCode-test.js.snap
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`QRCode renders correctly 1`] = `
<div>
<div>
Expand Down
Loading

0 comments on commit 604c49b

Please sign in to comment.