Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade React Native to 0.26 #1027

Merged
merged 3 commits into from
May 24, 2016
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,115 changes: 3,060 additions & 1,055 deletions Lets Do This.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ PODS:
- NSString+RemoveEmoji (0.1.0)
- Parse (1.8.5):
- Bolts/Tasks (>= 1.2.2)
- React/Core (0.22.2)
- React/RCTImage (0.22.2):
- React/Core (0.26.1)
- React/RCTImage (0.26.1):
- React/Core
- React/RCTNetwork
- React/RCTNetwork (0.22.2):
- React/RCTNetwork (0.26.1):
- React/Core
- React/RCTText (0.22.2):
- React/RCTText (0.26.1):
- React/Core
- React/RCTWebSocket (0.22.2):
- React/RCTWebSocket (0.26.1):
- React/Core
- SDWebImage (3.7.3):
- SDWebImage/Core (= 3.7.3)
Expand Down Expand Up @@ -94,7 +94,7 @@ SPEC CHECKSUMS:
NewRelicAgent: c85f94358d6e02761cae6707364c4402a352a08f
NSString+RemoveEmoji: 6901fb3a1cc9b6d0c0fc858155898b041fdfb493
Parse: 17ad8e0677ed682f7f00503860fcda0f4eb74168
React: be2dc9f9a325f0b4db1fcd3a0cea29c0e00af9b7
React: 9a7eb5f6e7146734fb50ab17f515087d302d5cca
SDWebImage: 1d2b1a1efda1ade1b00b6f8498865f8ddedc8a84
SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d
SVProgressHUD: 748080e4f36e603f6c02aec292664239df5279c1
Expand Down
4 changes: 3 additions & 1 deletion ReactComponents/ActionGuidesView.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
'use strict';

import React, {
import React from 'react';

import {
ListView,
StyleSheet,
Text,
Expand Down
10 changes: 6 additions & 4 deletions ReactComponents/CampaignView.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
'use strict';

import React, {
StyleSheet,
import React from 'react';

import {
Text,
Image,
TouchableHighlight,
ListView,
View,
ActivityIndicatorIOS,
RefreshControl,
NativeAppEventEmitter
NativeAppEventEmitter,
StyleSheet,
} from 'react-native';
import Dimensions from 'Dimensions';

Expand Down Expand Up @@ -435,7 +437,7 @@ var CampaignResources = React.createClass({
}
});

var styles = React.StyleSheet.create({
var styles = StyleSheet.create({
loadingContainer: {
flex: 1,
flexDirection: 'row',
Expand Down
7 changes: 4 additions & 3 deletions ReactComponents/CauseDetailView.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
'use strict';

import React, {
import React, {Component} from 'react';

import {
AppRegistry,
ListView,
Component,
StyleSheet,
Text,
Image,
Expand Down Expand Up @@ -163,7 +164,7 @@ var CauseDetailView = React.createClass({
},
});

var styles = React.StyleSheet.create({
var styles = StyleSheet.create({
loadingContainer: {
flex: 1,
flexDirection: 'row',
Expand Down
7 changes: 4 additions & 3 deletions ReactComponents/CauseListView.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
'use strict';

import React, {
import React, {Component} from 'react';

import {
AppRegistry,
ActivityIndicatorIOS,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not certain yet but I suspect we don't need this Component at all...

ListView,
Component,
StyleSheet,
Text,
Image,
Expand Down Expand Up @@ -132,7 +133,7 @@ var CauseListView = React.createClass({
},
});

var styles = React.StyleSheet.create({
var styles = StyleSheet.create({
listView: {
backgroundColor: '#FFFFFF',
paddingBottom: 10,
Expand Down
6 changes: 4 additions & 2 deletions ReactComponents/NetworkErrorView.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
'use strict';

import React, {
import React from 'react';

import {
StyleSheet,
Text,
Image,
Expand Down Expand Up @@ -43,7 +45,7 @@ var NetworkErrorView = React.createClass({
},
});

var styles = React.StyleSheet.create({
var styles = StyleSheet.create({
container: {
flex: 1,
justifyContent: 'center',
Expand Down
4 changes: 3 additions & 1 deletion ReactComponents/NetworkImage.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
'use strict';

import React, {
import React from 'react';

import {
Component,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved this into React, but thinking we actually don't need (refs https://github.com/DoSomething/LetsDoThis-iOS/pull/1027/files#r64401642)

StyleSheet,
Text,
Expand Down
4 changes: 3 additions & 1 deletion ReactComponents/NewsFeedPost.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
'use strict';

import React, {
import React from 'react';

import {
StyleSheet,
Text,
Image,
Expand Down
7 changes: 4 additions & 3 deletions ReactComponents/NewsFeedView.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
'use strict';

import React, {
import React, {Component} from 'react';

import {
AppRegistry,
ActivityIndicatorIOS,
ListView,
Component,
StyleSheet,
Text,
RefreshControl,
Expand Down Expand Up @@ -118,7 +119,7 @@ var NewsFeedView = React.createClass({
});


var styles = React.StyleSheet.create({
var styles = StyleSheet.create({
listView: {
backgroundColor: '#DFDFDF',
paddingLeft: 10,
Expand Down
6 changes: 4 additions & 2 deletions ReactComponents/ReportbackItemView.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
'use strict';

import React, {
import React from 'react';

import {
StyleSheet,
Text,
Image,
Expand Down Expand Up @@ -96,7 +98,7 @@ var ReportbackItemView = React.createClass({
},
});

var styles = React.StyleSheet.create({
var styles = StyleSheet.create({
container: {
backgroundColor: 'white',
paddingTop: 16,
Expand Down
8 changes: 5 additions & 3 deletions ReactComponents/SponsorView.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
'use strict';

import React, {
import React from 'react';

import {
Image,
StyleSheet,
Text,
Image,
View,
} from 'react-native';

Expand All @@ -25,7 +27,7 @@ var SponsorView = React.createClass({
}
});

var styles = React.StyleSheet.create({
var styles = StyleSheet.create({
container: {
paddingTop: 8,
},
Expand Down
6 changes: 3 additions & 3 deletions ReactComponents/Style.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
'use strict';

var React = require('react-native');
var ReactNative = require('react-native');

var {
StyleSheet,
} = React;
} = ReactNative;

var Bridge = require('react-native').NativeModules.LDTReactBridge;
var colorCtaBlue = Bridge.colorCtaBlue;
Expand Down Expand Up @@ -84,4 +84,4 @@ module.exports = StyleSheet.create({
fontFamily: fontFamilyBoldName,
fontSize: fontSizeTitle,
},
});
});
8 changes: 5 additions & 3 deletions ReactComponents/UserView.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
'use strict';

import React, {
Component,
import React, {Component} from 'react';

import {
ListView,
StyleSheet,
Text,
Expand All @@ -18,6 +19,7 @@ var Helpers = require('./Helpers.js');
var NetworkErrorView = require('./NetworkErrorView.js');
var Bridge = require('react-native').NativeModules.LDTReactBridge;
var ReportbackItemView = require('./ReportbackItemView.js');

var firstSectionHeaderText = "Actions I'm Doing";
var secondSectionHeaderText = "Actions I've Done";

Expand Down Expand Up @@ -353,7 +355,7 @@ var UserView = React.createClass({
},
});

var styles = React.StyleSheet.create({
var styles = StyleSheet.create({
loadingContainer: {
flex: 1,
flexDirection: 'row',
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"homepage": "https://github.com/DoSomething/LetsDoThis-iOS#readme",
"dependencies": {
"react": "^0.14.8",
"react-native": "^0.22.2"
"react": "15.0.2",
"react-native": "^0.26.1"
}
}