Merge pull request #55 from bartonhammond/develop

Upgrade to RN 0.18.1

Author: bartonhammond

bitrise/bitrise-android.yml

@@ -21,12 +21,19 @@ workflows:
             curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -
             apt-get install -y nodejs
     - script@1.1.0:
-        title: npm install
+        title: npm install -g npm3
         inputs:
         - content: |-
             #!/bin/bash
 
-            npm install
+            npm install -g npm3
+    - script@1.1.0:
+        title: npm3 install
+        inputs:
+        - content: |-
+            #!/bin/bash
+
+            npm3 install
     - script@1.1.0:
         title: npm test
         inputs:

bitrise/bitrise-ios.yml

@@ -22,12 +22,19 @@ workflows:
         - ssh_key_save_path: "$HOME/.ssh/steplib_ssh_step_id_rsa"
     - git-clone@3.1.0: {}
     - script@1.1.0:
-        title: npm install
+        title: npm install -g npm3
         inputs:
         - content: |-
             #!/bin/bash
 
-            npm install
+            npm install -g npm3
+    - script@1.1.0:
+        title: npm3 install
+        inputs:
+        - content: |-
+            #!/bin/bash
+
+            npm3 install
     - script@1.1.0:
         title: npm test
         inputs:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "snowflake",
-  "version": "0.0.9b",
+  "version": "0.0.10",
   "private": true,
   "jest": {
     "scriptPreprocessor": "jestSupport/scriptPreprocess.js",
@@ -43,29 +43,29 @@
   },
   "dependencies": {
     "apsl-react-native-button": "git+https://git@github.com/bartonhammond/react-native-button.git",
-    "immutable": "^3.7.5",
+    "immutable": "^3.7.6",
     "key-mirror": "^1.0.1",
-    "react-native": "^0.17.0",
+    "react-native": "^0.18.1",
     "react-native-gifted-spinner": "0.0.3",
     "react-native-simple-store": "^0.1.0",
     "react-native-simpledialog-android": "^1.0.2",
-    "react-native-tab-navigator": "^0.2.11",
-    "react-native-vector-icons": "^1.0.4",
-    "react-redux": "^3.1.0",
-    "redux": "^3.0.4",
-    "redux-thunk": "^1.0.0",
+    "react-native-tab-navigator": "^0.2.15",
+    "react-native-vector-icons": "^1.1.0",
+    "react-redux": "^4.1.1",
+    "redux": "^3.1.2",
+    "redux-thunk": "^1.0.3",
     "regenerator": "^0.8.42",
-    "tcomb-form-native": "^0.3.0",
+    "tcomb-form-native": "^0.3.3",
     "underscore": "^1.8.3",
     "validate.js": "^0.9.0"
   },
   "devDependencies": {
     "babel-core": "^6.4.5",
     "babel-jest": "^6.0.1",
     "docker": "^0.2.14",
-    "istanbul": "gotwarlost/istanbul#source-map",
+    "istanbul": "^0.4.2",
     "jest-cli": "^0.8.2",
-    "react": "^0.14.3",
-    "react-addons-test-utils": "^0.14.3"
+    "react": "^0.14.7",
+    "react-addons-test-utils": "^0.14.7"
   }
 }

src/containers/App.js

@@ -13,7 +13,7 @@
  * Imports from redux
  */
 import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux/native';
+import { connect } from 'react-redux';
 
 /**
  * Immutable Map

src/containers/Login.js

@@ -11,7 +11,7 @@
  * Redux 
  */
 import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux/native';
+import { connect } from 'react-redux';
 
 /**
  * The actions we need

src/containers/Profile.js

@@ -13,7 +13,7 @@
 * Redux
 */
 import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux/native';
+import { connect } from 'react-redux';
 
 /**
  * The actions we need

src/reducers/auth/__tests__/authActions-test.js

@@ -180,10 +180,10 @@ describe('authActions', () => {
    * the following tests describe the actions that should be
    * dispatched the function is invoked
    *
-   * *Note*: these tests are run with ```pit``` because they are async
+   * *Note*: these tests are run with ```it``` because they are async
    *
    */
-  pit('should logout', () => {
+  it('should logout', () => {
     const expectedActions = [
       {type: LOGOUT_REQUEST},
       {type: LOGIN_STATE_REGISTER},
@@ -196,7 +196,7 @@ describe('authActions', () => {
     return store.dispatch(actions.logout());
   });
 
-  pit('should login', () => {
+  it('should login', () => {
     const expectedActions = [
       {type: LOGIN_REQUEST},
       {type: LOGIN_STATE_LOGOUT},
@@ -207,7 +207,7 @@ describe('authActions', () => {
     return store.dispatch(actions.login('foo','bar'));
   });
 
-  pit('should getSessionToken', () => {
+  it('should getSessionToken', () => {
     const expectedActions = [
       {type: SESSION_TOKEN_REQUEST},      
       {type: LOGIN_STATE_LOGOUT},
@@ -218,7 +218,7 @@ describe('authActions', () => {
     return store.dispatch(actions.getSessionToken());
   });
 
-  pit('should signup', () => {
+  it('should signup', () => {
     const expectedActions = [
       {type: SIGNUP_REQUEST},      
       {type: LOGIN_STATE_LOGOUT},
@@ -229,7 +229,7 @@ describe('authActions', () => {
     return store.dispatch(actions.signup('user','email','password'));
   });
 
-  pit('should resetPassword', () => {
+  it('should resetPassword', () => {
     const expectedActions = [
       {type: RESET_PASSWORD_REQUEST},      
       {type: LOGIN_STATE_LOGIN},
@@ -240,7 +240,7 @@ describe('authActions', () => {
     return store.dispatch(actions.resetPassword('email'));
   });
 
-  pit('should deleteSessionToken', () => {
+  it('should deleteSessionToken', () => {
     const expectedActions = [
       {type: SESSION_TOKEN_REQUEST},
       {type: SESSION_TOKEN_SUCCESS}      

src/reducers/profile/__tests__/profileActions-test.js

@@ -100,7 +100,7 @@ describe('profileActions', () => {
    * *Note*: these tests are run with ```pit``` because they are async
    *
    */
-  pit('should getProfile', () => {
+  it('should getProfile', () => {
     const expectedActions = [
       {type: GET_PROFILE_REQUEST},
       {type: GET_PROFILE_SUCCESS}
@@ -110,7 +110,7 @@ describe('profileActions', () => {
     return store.dispatch(actions.getProfile());
   });
 
-  pit('should updateProfile', () => {
+  it('should updateProfile', () => {
     const expectedActions = [
       {type: PROFILE_UPDATE_REQUEST},
       {type: PROFILE_UPDATE_SUCCESS},

src/snowflake.js

@@ -12,7 +12,7 @@
  * ```thunk``` and the initial state.
  */
 import React, { AppRegistry } from 'react-native';
-import { Provider } from 'react-redux/native';
+import { Provider } from 'react-redux';
 import App from './containers/App';
 import configureStore from './lib/configureStore';
 
@@ -38,7 +38,7 @@ import profileInitialState from './reducers/profile/profileInitialState';
 /**
  *  The version of the app but not  displayed yet
  */
-var VERSION='0.0.9';
+var VERSION='0.0.10';
 
 /**
  *
@@ -76,8 +76,8 @@ export default function native(platform) {
        * have a ```store```
        */
       return (
-          <Provider store={store}>
-          {() => <App store={store}/>}
+        <Provider store={store}>
+          <App/>
         </Provider>
       );