Skip to content

Commit 069910a

Browse files
committed
Merge tag '5.1.3' into develop
Release 5.1.3
2 parents 0e51466 + 664f0a3 commit 069910a

15 files changed

Lines changed: 17548 additions & 22 deletions

File tree

.circleci/config.yml

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# This configuration was automatically generated from a CircleCI 1.0 config.
2+
# It should include any build commands you had along with commands that CircleCI
3+
# inferred from your project structure. We strongly recommend you read all the
4+
# comments in this file to understand the structure of CircleCI 2.0, as the idiom
5+
# for configuration has changed substantially in 2.0 to allow arbitrary jobs rather
6+
# than the prescribed lifecycle of 1.0. In general, we recommend using this generated
7+
# configuration as a reference rather than using it in production, though in most
8+
# cases it should duplicate the execution of your original 1.0 config.
9+
version: 2
10+
jobs:
11+
build:
12+
working_directory: ~/awesomejerry/react-native-qrcode-svg
13+
parallelism: 1
14+
shell: /bin/bash --login
15+
# CircleCI 2.0 does not support environment variables that refer to each other the same way as 1.0 did.
16+
# If any of these refer to each other, rewrite them so that they don't or see https://circleci.com/docs/2.0/env-vars/#interpolating-environment-variables-to-set-other-environment-variables .
17+
environment:
18+
CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
19+
CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
20+
# In CircleCI 1.0 we used a pre-configured image with a large number of languages and other packages.
21+
# In CircleCI 2.0 you can now specify your own image, or use one of our pre-configured images.
22+
# The following configuration line tells CircleCI to use the specified docker image as the runtime environment for you job.
23+
# We have selected a pre-built image that mirrors the build environment we use on
24+
# the 1.0 platform, but we recommend you choose an image more tailored to the needs
25+
# of each job. For more information on choosing an image (or alternatively using a
26+
# VM instead of a container) see https://circleci.com/docs/2.0/executor-types/
27+
# To see the list of pre-built images that CircleCI provides for most common languages see
28+
# https://circleci.com/docs/2.0/circleci-images/
29+
docker:
30+
- image: circleci/build-image:ubuntu-14.04-XXL-upstart-1189-5614f37
31+
command: /sbin/init
32+
steps:
33+
# Machine Setup
34+
# If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
35+
# The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out.
36+
- checkout
37+
# Prepare for artifact and test results collection equivalent to how it was done on 1.0.
38+
# In many cases you can simplify this from what is generated here.
39+
# 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/'
40+
- run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
41+
# This is based on your 1.0 configuration file or project settings
42+
- run:
43+
working_directory: ~/awesomejerry/react-native-qrcode-svg
44+
command: nvm install 6.9.1 && nvm alias default 6.9.1
45+
# Dependencies
46+
# This would typically go in either a build or a build-and-test job when using workflows
47+
# Restore the dependency cache
48+
- restore_cache:
49+
keys:
50+
# This branch if available
51+
- v1-dep-{{ .Branch }}-
52+
# Default branch if not
53+
- v1-dep-master-
54+
# Any branch if there are none on the default branch - this should be unnecessary if you have your default branch configured correctly
55+
- v1-dep-
56+
# This is based on your 1.0 configuration file or project settings
57+
- run: npm install
58+
# Save dependency cache
59+
- save_cache:
60+
key: v1-dep-{{ .Branch }}-{{ epoch }}
61+
paths:
62+
# This is a broad list of cache paths to include many possible development environments
63+
# You can probably delete some of these entries
64+
- vendor/bundle
65+
- ~/virtualenvs
66+
- ~/.m2
67+
- ~/.ivy2
68+
- ~/.bundle
69+
- ~/.go_workspace
70+
- ~/.gradle
71+
- ~/.cache/bower
72+
- ./node_modules
73+
# Test
74+
# This would typically be a build job when using workflows, possibly combined with build
75+
# This is based on your 1.0 configuration file or project settings
76+
- run: npm run test
77+
# Deployment
78+
# Your existing circle.yml file contains deployment steps.
79+
# The config translation tool does not support translating deployment steps
80+
# since deployment in CircleCI 2.0 are better handled through workflows.
81+
# See the documentation for more information https://circleci.com/docs/2.0/workflows/
82+
# Teardown
83+
# If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
84+
# Save test results
85+
- store_test_results:
86+
path: /tmp/circleci-test-results
87+
# Save artifacts
88+
- store_artifacts:
89+
path: /tmp/circleci-artifacts
90+
- store_artifacts:
91+
path: /tmp/circleci-test-results

circle.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

example-expo/.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
node_modules/**/*
2+
.expo/*
3+
npm-debug.*
4+
*.jks
5+
*.p12
6+
*.key
7+
*.mobileprovision

example-expo/.watchmanconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

example-expo/App.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import React from 'react'
2+
import { StyleSheet, View } from 'react-native'
3+
import QRCode from 'react-native-qrcode-svg'
4+
5+
export default class App extends React.Component {
6+
render () {
7+
return (
8+
<View style={styles.container}>
9+
<QRCode value='hello world' />
10+
</View>
11+
)
12+
}
13+
}
14+
15+
const styles = StyleSheet.create({
16+
container: {
17+
flex: 1,
18+
backgroundColor: '#fff',
19+
alignItems: 'center',
20+
justifyContent: 'center'
21+
}
22+
})

example-expo/app.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"expo": {
3+
"name": "react-native-qrcode-svg",
4+
"slug": "example-expo",
5+
"privacy": "public",
6+
"sdkVersion": "32.0.0",
7+
"platforms": [
8+
"ios",
9+
"android"
10+
],
11+
"version": "1.0.0",
12+
"orientation": "portrait",
13+
"icon": "./assets/icon.png",
14+
"splash": {
15+
"image": "./assets/splash.png",
16+
"resizeMode": "contain",
17+
"backgroundColor": "#ffffff"
18+
},
19+
"updates": {
20+
"fallbackToCacheTimeout": 0
21+
},
22+
"assetBundlePatterns": [
23+
"**/*"
24+
],
25+
"ios": {
26+
"supportsTablet": true
27+
}
28+
}
29+
}

example-expo/assets/icon.png

2.91 KB
Loading

example-expo/assets/splash.png

7.01 KB
Loading

example-expo/babel.config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = function (api) {
2+
api.cache(true)
3+
return {
4+
presets: ['babel-preset-expo']
5+
}
6+
}

example-expo/package.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"main": "node_modules/expo/AppEntry.js",
3+
"scripts": {
4+
"start": "expo start",
5+
"android": "expo start --android",
6+
"ios": "expo start --ios",
7+
"eject": "expo eject"
8+
},
9+
"dependencies": {
10+
"expo": "^32.0.0",
11+
"react": "16.5.0",
12+
"react-native": "https://github.com/expo/react-native/archive/sdk-32.0.0.tar.gz",
13+
"react-native-qrcode-svg": "^5.1.2"
14+
},
15+
"devDependencies": {
16+
"babel-preset-expo": "^5.0.0"
17+
},
18+
"private": true
19+
}

0 commit comments

Comments
 (0)