Skip to content
This repository was archived by the owner on Mar 25, 2025. It is now read-only.

Commit 7eb11c6

Browse files
moduvalmoduval
committed
Merge branch 'master' into improve-mapDispatchToProps
# Conflicts: # src/containers/App.js # src/containers/Main.js
2 parents 6f25318 + aa31bd0 commit 7eb11c6

13 files changed

Lines changed: 100 additions & 75 deletions

File tree

‎README.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ The following videos will walk you through setting up CI with BitRise.io
246246
- [Create iOS App](#create-ios-app)
247247
- [iOS install](#ios-install)
248248
- [Android Setup](#android-setup)
249+
- [Addendum #1](#addendum-#1)
249250
- [Things not addressed](#things-not-addressed)
250251

251252
----------
@@ -370,6 +371,22 @@ alt="Android Setup" width="240" height="180" border="10"/>
370371
* Import YML
371372
* Run build
372373

374+
##### Addendum #1
375+
* **Video **: [XCode Edge Stack, WorkFlow](https://youtu.be/mP5D2MQboxw)
376+
<a
377+
href="http://www.youtube.com/watch?feature=player_embedded&v=mP5D2MQboxw"
378+
target="_blank">
379+
<img src="https://i9.ytimg.com/vi/mP5D2MQboxw/1.jpg?sqp=CPDqzb0F&rs=AOn4CLBdpVDIWghF_-wSuaSKnbPdxHE1hw"
380+
alt="XCode Edge Stack" width="240" height="180" border="10"/>
381+
</a>
382+
383+
* "XCode Edge Stack" for iOS
384+
* New React-Native steps for Install & Bundle
385+
* Upgraded Step versions
386+
* GitHub branch triggers
387+
388+
389+
373390
##### Things not addressed
374391
* Submission to any store
375392
* Working with other CIs

‎bitrise/bitrise-android.yml‎

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,75 +2,60 @@
22
format_version: 1.1.0
33
default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
44
trigger_map:
5-
- pattern: "*"
5+
- pattern: master
66
is_pull_request_allowed: true
77
workflow: primary
88
workflows:
99
primary:
1010
steps:
11-
- activate-ssh-key@3.1.0:
11+
- activate-ssh-key@3.1.1:
1212
title: Activate App SSH key
1313
inputs:
1414
- ssh_key_save_path: "$HOME/.ssh/steplib_ssh_step_id_rsa"
15-
- git-clone@3.1.1: {}
16-
- script@1.1.0:
17-
title: install node & npm
18-
inputs:
19-
- content: |-
20-
#!/bin/bash
21-
curl -sL https://deb.nodesource.com/setup_5.x | sudo -E bash -
22-
apt-get install -y nodejs
23-
- script@1.1.0:
15+
- git-clone@3.3.3: {}
16+
- script@1.1.2:
2417
title: npm install
2518
inputs:
2619
- content: |-
2720
#!/bin/bash
2821
2922
npm install
30-
- script@1.1.0:
23+
- script@1.1.2:
3124
title: npm test
3225
inputs:
3326
- content: |-
3427
#!/bin/bash
3528
3629
npm test
37-
- script@1.1.0:
38-
title: npm install react-native -g
39-
inputs:
40-
- content: |-
41-
#!/bin/bash
42-
43-
npm install -g react-native-cli
44-
- script@1.1.0:
30+
- install-react-native@0.1.0: {}
31+
- script@1.1.2:
4532
title: create config
4633
inputs:
4734
- content: |-
4835
#!/bin/bash
4936
touch src/lib/config.js
5037
5138
echo "module.exports={ PARSE: {APP_ID: '$PARSE_APP_ID' ,REST_API_KEY: '$PARSE_REST_API_KEY', SESSION_TOKEN_KEY: 'SESSION_TOKEN_KEY'}}" >> src/lib/config.js
52-
- script@1.1.0:
53-
title: bundle-android
39+
- react-native-bundle@0.1.2:
5440
inputs:
55-
- content: |-
56-
#!/bin/bash
57-
58-
react-native bundle --entry-file ./index.android.js --platform android --bundle-output android/app/src/main/assets/index.android.bundle
59-
- script@1.1.0:
41+
- platform: android
42+
- entry_file: "./index.android.js"
43+
- out: android/app/src/main/assets/index.android.bundle
44+
- script@1.1.2:
6045
title: gradlew
6146
inputs:
6247
- content: "#!/bin/bash\n\ncd android \n./gradlew assembleRelease"
6348
opts:
6449
is_expand: true
65-
- sign-apk@0.9.4:
50+
- sign-apk@1.0.1:
6651
inputs:
6752
- apk_path: "/bitrise/src/android/app/build/outputs/apk/app-release-unsigned.apk"
68-
- script@1.1.0:
53+
- script@1.1.2:
6954
title: cp apk
7055
inputs:
7156
- content: |-
7257
#!/bin/bash
7358
7459
cp $BITRISE_SIGNED_APK_PATH $BITRISE_DEPLOY_DIR/signed-app-release.apk
75-
- deploy-to-bitrise-io@1.2.2:
60+
- deploy-to-bitrise-io@1.2.4:
7661
is_always_run: false

‎bitrise/bitrise-ios.yml‎

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,54 +10,48 @@ app:
1010
opts:
1111
is_expand: false
1212
trigger_map:
13-
- pattern: "*"
13+
- pattern: master
1414
is_pull_request_allowed: true
1515
workflow: primary
1616
workflows:
1717
primary:
1818
steps:
19-
- activate-ssh-key@3.1.0:
19+
- activate-ssh-key@3.1.1:
2020
title: Activate App SSH key
2121
inputs:
2222
- ssh_key_save_path: "$HOME/.ssh/steplib_ssh_step_id_rsa"
23-
- git-clone@3.1.0: {}
24-
- script@1.1.0:
23+
- git-clone@3.3.3:
24+
inputs:
25+
- clone_depth: '1'
26+
- script@1.1.2:
2527
title: npm install
2628
inputs:
2729
- content: |-
2830
#!/bin/bash
2931
3032
npm install
31-
- script@1.1.0:
33+
- script@1.1.2:
3234
title: npm test
3335
inputs:
3436
- content: |-
3537
#!/bin/bash
3638
3739
npm test
38-
- script@1.1.0:
39-
title: npm install react-native -g
40-
inputs:
41-
- content: |-
42-
#!/bin/bash
43-
44-
npm install -g react-native-cli
45-
- script@1.1.0:
40+
- install-react-native@0.1.0: {}
41+
- script@1.1.2:
4642
title: create config
4743
inputs:
4844
- content: |-
4945
#!/bin/bash
5046
touch src/lib/config.js
5147
5248
echo "module.exports={ PARSE: {APP_ID: '$PARSE_APP_ID' ,REST_API_KEY: '$PARSE_REST_API_KEY', SESSION_TOKEN_KEY: 'SESSION_TOKEN_KEY'}}" >> src/lib/config.js
53-
- script@1.1.0:
54-
title: bundle-ios
49+
- react-native-bundle@0.1.2:
5550
inputs:
56-
- content: |-
57-
#!/bin/bash
58-
react-native bundle --entry-file ./index.ios.js --platform ios --bundle-output ios/main.jsbundle
59-
- certificate-and-profile-installer@1.4.0: {}
60-
- fastlane@2.1.0:
51+
- entry_file: "./index.ios.js"
52+
- out: ios/main.jsbundle
53+
- certificate-and-profile-installer@1.6.0: {}
54+
- fastlane@2.2.0:
6155
inputs:
6256
- lane: ios beta
63-
- deploy-to-bitrise-io@1.2.0: {}
57+
- deploy-to-bitrise-io@1.2.4: {}

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "snowflake",
3-
"version": "0.1.5",
3+
"version": "0.1.6",
44
"private": true,
55
"jest": {
66
"preset": "jest-react-native",
@@ -47,7 +47,7 @@
4747
"babel-core": "6.9.0",
4848
"babel-jest": "14.0.0",
4949
"babel-preset-react-native": "1.8.0",
50-
"docker": "0.2.14",
50+
"docker": "1.0.0",
5151
"istanbul": "0.4.3",
5252
"jest": "14.0.0",
5353
"jest-react-native": "14.0.0",

‎src/components/LoginRender.js‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,6 @@ var styles = StyleSheet.create({
103103
* ## Redux boilerplate
104104
*/
105105

106-
function mapStateToProps(state) {
107-
return {
108-
};
109-
}
110-
111106
function mapDispatchToProps(dispatch) {
112107
return {
113108
actions: bindActionCreators({ ...authActions, ...globalActions }, dispatch),
@@ -304,4 +299,4 @@ class LoginRender extends Component {
304299
);
305300
}
306301
}
307-
export default connect(mapStateToProps, mapDispatchToProps)(LoginRender);
302+
export default connect(null, mapDispatchToProps)(LoginRender);

‎src/containers/App.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,16 @@ import Header from '../components/Header';
4949
*/
5050
function mapStateToProps(state) {
5151
return {
52-
...state
52+
deviceVersion: state.device.version,
53+
auth: {
54+
form: {
55+
isFetching: state.auth.form.isFetching,
56+
},
57+
},
58+
global: {
59+
currentState: state.global.currentState,
60+
showState: state.global.showState,
61+
},
5362
};
5463
};
5564

@@ -115,7 +124,7 @@ let App = React.createClass({
115124
onSetState={this.props.actions.setState}
116125
/>
117126

118-
<Text style={ styles.summary }>Snowflake {I18n.t("App.version")}: {this.props.device.version}</Text>
127+
<Text style={ styles.summary }>Snowflake {I18n.t("App.version")}: {this.props.deviceVersion}</Text>
119128
</View>
120129
);
121130
}

‎src/containers/ForgotPassword.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ const {
4343

4444
function mapStateToProps(state) {
4545
return {
46-
...state
46+
auth: state.auth,
47+
global: state.global,
4748
};
4849
}
4950

‎src/containers/Login.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ const actions = [
4848

4949
function mapStateToProps(state) {
5050
return {
51-
...state
51+
auth: state.auth,
52+
global: state.global,
5253
};
5354
}
5455

‎src/containers/Logout.js‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,18 @@ var styles = StyleSheet.create({
5959
*/
6060

6161
function mapStateToProps(state) {
62-
return {
63-
...state
64-
}
62+
return {
63+
auth: {
64+
form: {
65+
isFetching: state.auth.form.isFetching,
66+
isValid: state.auth.form.isValid,
67+
},
68+
},
69+
global: {
70+
currentState: state.global.currentState,
71+
showState: state.global.showState,
72+
},
73+
};
6574
};
6675

6776
function mapDispatchToProps(dispatch) {

‎src/containers/Main.js‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,17 @@ const Button = require('apsl-react-native-button');
5555
*
5656
*/
5757
function mapStateToProps(state) {
58-
return {
59-
...state
60-
}
58+
return {
59+
auth: {
60+
form: {
61+
isFetching: state.auth.form.isFetching,
62+
},
63+
},
64+
global: {
65+
currentState: state.global.currentState,
66+
showState: state.global.showState,
67+
},
68+
};
6169
};
6270

6371
/*

0 commit comments

Comments
 (0)