updated react imports for RN 0.26.0 upgrade

halilb · May 20, 2016 · 4614f55 · 4614f55
1 parent 105536d
commit 4614f55
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 28 deletions.
diff --git a/Example/PhotoBrowserExample.js b/Example/PhotoBrowserExample.js
@@ -3,10 +3,10 @@
  * https://github.com/facebook/react-native
  */
 
-import React, {
+import React, { Component } from 'react';
+import {
   ActionSheetIOS,
   CameraRoll,
-  Component,
   ListView,
   StyleSheet,
   Navigator,

diff --git a/Example/ios/PhotoBrowserExample.xcodeproj/project.pbxproj b/Example/ios/PhotoBrowserExample.xcodeproj/project.pbxproj
@@ -679,7 +679,11 @@
 				);
 				INFOPLIST_FILE = PhotoBrowserExample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_CODE_SIGN_FLAGS = "";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-lc++",
+				);
 				PRODUCT_NAME = PhotoBrowserExample;
 			};
 			name = Debug;
@@ -695,7 +699,11 @@
 				);
 				INFOPLIST_FILE = PhotoBrowserExample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_CODE_SIGN_FLAGS = "";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-lc++",
+				);
 				PRODUCT_NAME = PhotoBrowserExample;
 			};
 			name = Release;

diff --git a/Example/package.json b/Example/package.json
@@ -6,9 +6,8 @@
     "start": "node node_modules/react-native/local-cli/cli.js start"
   },
   "dependencies": {
-    "react": "^0.14.8",
-    "react-native": "^0.23.0",
-    "react-native-photo-browser": "file:../",
-    "react-native-progress": "^2.2.2"
+    "react": "^15.0.2",
+    "react-native": "^0.26.0",
+    "react-native-photo-browser": "file:../"
   }
 }
diff --git a/lib/FullScreenContainer.js b/lib/FullScreenContainer.js
@@ -1,11 +1,11 @@
-import React, {
+import React, { PropTypes } from 'react';
+import {
   DeviceEventEmitter,
   Dimensions,
   ListView,
   View,
   ViewPagerAndroid,
   StyleSheet,
-  PropTypes,
   Platform,
   StatusBar,
   TouchableWithoutFeedback,

diff --git a/lib/GridContainer.js b/lib/GridContainer.js
@@ -1,6 +1,6 @@
-import React, {
+import React, { PropTypes } from 'react';
+import {
   Dimensions,
-  PropTypes,
   ListView,
   TouchableHighlight,
   View,

diff --git a/lib/bar/BarContainer.js b/lib/bar/BarContainer.js
@@ -1,8 +1,7 @@
-import React, {
+import React, { PropTypes, Component } from 'react';
+import {
   Animated,
-  Component,
   StyleSheet,
-  PropTypes,
   View,
 } from 'react-native';
 

diff --git a/lib/bar/BottomBar.js b/lib/bar/BottomBar.js
@@ -1,8 +1,8 @@
-import React, {
+import React, { PropTypes } from 'react';
+import {
   Image,
   Text,
   StyleSheet,
-  PropTypes,
   TouchableOpacity,
   View,
 } from 'react-native';

diff --git a/lib/bar/TopBar.js b/lib/bar/TopBar.js
@@ -1,10 +1,9 @@
-import React, {
+import React, { PropTypes } from 'react';
+import {
   Image,
   Text,
-  PropTypes,
   StyleSheet,
   TouchableOpacity,
-  View,
   Platform,
 } from 'react-native';
 

diff --git a/lib/index.js b/lib/index.js
@@ -1,7 +1,7 @@
-import React, {
+import React, { PropTypes } from 'react';
+import {
   Animated,
   Dimensions,
-  PropTypes,
   ListView,
   View,
   StyleSheet,

diff --git a/lib/media/Photo.js b/lib/media/Photo.js
@@ -1,16 +1,15 @@
-import React, {
-  Component,
+import React, { PropTypes, Component } from 'react';
+import {
   Dimensions,
   Image,
   StyleSheet,
   View,
   TouchableWithoutFeedback,
-  PropTypes,
   ProgressBarAndroid,
   Platform,
 } from 'react-native';
 
-import Progress from 'react-native-progress';
+import * as Progress from 'react-native-progress';
 
 export default class Photo extends Component {
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-photo-browser",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Local and remote photo browser with captions, selections and grid view support for react native.",
   "license": "MIT",
   "keywords": [
@@ -25,6 +25,6 @@
   "author": "Halil Bilir <[email protected]>",
   "homepage": "https://github.com/halilb/react-native-photo-browser#readme",
   "dependencies": {
-    "react-native-progress": "^2.2.2"
+    "react-native-progress": "^3.0.0"
   }
 }