upgrade to RN 25.1 JS changes

artald · artald · commit 237abdbfb44c · 2016-05-19T17:20:29.000+03:00
diff --git a/example/ios/example.xcodeproj/project.pbxproj b/example/ios/example.xcodeproj/project.pbxproj
@@ -651,7 +651,10 @@
 				INFOPLIST_FILE = example/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-l\"c++\"",
+				);
 				PRODUCT_NAME = example;
 			};
 			name = Debug;
@@ -669,7 +672,10 @@
 				INFOPLIST_FILE = example/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-l\"c++\"",
+				);
 				PRODUCT_NAME = example;
 			};
 			name = Release;
@@ -716,6 +722,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "";
 				SDKROOT = iphoneos;
 			};
 			name = Debug;
@@ -755,6 +762,7 @@
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_LDFLAGS = "";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
diff --git a/example/package.json b/example/package.json
@@ -6,7 +6,8 @@
     "start": "node node_modules/react-native/local-cli/cli.js start"
   },
   "dependencies": {
-    "react-native": "^0.21.0",
+    "react-native": "0.25.1",
+    "react": "0.14.5",
     "react-native-navigation": "latest"
   }
 }
diff --git a/example/src/app.js b/example/src/app.js
@@ -1,6 +1,6 @@
-import React, {
+import React, {Component} from 'react';
+import {
   AppRegistry,
-  Component,
   View
 } from 'react-native';
 import { Navigation } from 'react-native-navigation';
@@ -11,7 +11,7 @@ registerScreens();
 
 AppRegistry.registerComponent('App', () => App);
 
-export default class App extends React.Component {
+export default class App extends Component {
   constructor(props) {
     super(props);
   }
diff --git a/example/src/screens/FirstTabScreen.android.js b/example/src/screens/FirstTabScreen.android.js
@@ -1,5 +1,5 @@
-import React, {
-  Component,
+import React, {Component} from 'react';
+import {
   Text,
   View,
   ScrollView,
diff --git a/example/src/screens/FirstTabScreen.ios.js b/example/src/screens/FirstTabScreen.ios.js
@@ -1,5 +1,5 @@
-import React, {
-  Component,
+import React, {Component} from 'react';
+import {
   Text,
   View,
   ScrollView,
diff --git a/example/src/screens/LightBoxScreen.js b/example/src/screens/LightBoxScreen.js
@@ -1,5 +1,5 @@
-import React, {
-  Component,
+import React, {Component} from 'react';
+import {
   Text,
   View,
   ScrollView,
diff --git a/example/src/screens/ModalScreen.js b/example/src/screens/ModalScreen.js
@@ -1,5 +1,5 @@
-import React, {
-  Component,
+import React, {Component} from 'react';
+import {
   Text,
   View,
   ScrollView,
diff --git a/example/src/screens/PushedScreen.js b/example/src/screens/PushedScreen.js
@@ -1,5 +1,5 @@
-import React, {
-  Component,
+import React, {Component} from 'react';
+import {
   Text,
   View,
   ScrollView,
diff --git a/example/src/screens/SecondTabScreen.android.js b/example/src/screens/SecondTabScreen.android.js
@@ -1,5 +1,5 @@
-import React, {
-  Component,
+import React, {Component} from 'react';
+import {
   Text,
   View,
   ScrollView,
diff --git a/example/src/screens/SecondTabScreen.ios.js b/example/src/screens/SecondTabScreen.ios.js
@@ -1,5 +1,5 @@
-import React, {
-  Component,
+import React, {Component} from 'react';
+import {
   Text,
   View,
   ScrollView,
diff --git a/example/src/screens/SideMenu.js b/example/src/screens/SideMenu.js
@@ -1,5 +1,5 @@
-import React, {
-  Component,
+import React, {Component} from 'react';
+import {
   Text,
   View,
   ScrollView,
diff --git a/example/src/screens/StyledScreen.js b/example/src/screens/StyledScreen.js
@@ -1,5 +1,5 @@
-import React, {
-  Component,
+import React, {Component} from 'react';
+import {
   Text,
   View,
   ScrollView,
diff --git a/example/src/screens/ThirdTabScreen.js b/example/src/screens/ThirdTabScreen.js
@@ -1,5 +1,5 @@
-import React, {
-  Component,
+import React, {Component} from 'react';
+import {
   Text,
   View,
   ScrollView,
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "type": "git",
     "url": "https://github.com/wix/react-native-navigation.git"
   },
-  "version": "0.2.5",
+  "version": "1.0.0",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "nativePackage": true,
   "bugs": {
@@ -18,10 +18,11 @@
   "author": "Tal Kol <talkol@gmail.com>",
   "license": "MIT",
   "peerDependencies": {
-    "react-native": ">=0.25.1"
+    "react-native": ">=0.25.1",
+    "react": ">=0.14.5"
   },
   "dependencies": {
-    "react-native-controllers": "github:wix/react-native-controllers#upgradeRN25"
+    "react-native-controllers": "^2.0.0"
   },
   "optionalDependencies": {
     "react-redux": "*"
diff --git a/src/Navigation.js b/src/Navigation.js
@@ -1,4 +1,5 @@
-import React, { AppRegistry } from 'react-native';
+import React from 'react';
+import { AppRegistry } from 'react-native';
 import platformSpecific from './platformSpecific';
 import Screen from './Screen';
 
diff --git a/src/Screen.js b/src/Screen.js
@@ -1,5 +1,5 @@
+import React, {Component} from 'react';
 import {
-  Component,
   NativeAppEventEmitter,
   DeviceEventEmitter,
   Platform
diff --git a/src/platformSpecific.android.js b/src/platformSpecific.android.js
@@ -1,6 +1,6 @@
-import React, {
-  AppRegistry,
-  Component
+import React, {Component} from 'react';
+import {
+  AppRegistry
 } from 'react-native';
 
 import Navigation from './Navigation';

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@`
`6`	`6`	`"start": "node node_modules/react-native/local-cli/cli.js start"`
`7`	`7`	`},`
`8`	`8`	`"dependencies": {`
`9`		`- "react-native": "^0.21.0",`
	`9`	`+ "react-native": "0.25.1",`
	`10`	`+ "react": "0.14.5",`
`10`	`11`	`"react-native-navigation": "latest"`
`11`	`12`	`}`
`12`	`13`	`}`