Browse Source

upgrade to RN 25.1 JS changes

Artal Druk 8 years ago
parent
commit
237abdbfb4

+ 10
- 2
example/ios/example.xcodeproj/project.pbxproj View File

651
 				INFOPLIST_FILE = example/Info.plist;
651
 				INFOPLIST_FILE = example/Info.plist;
652
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
652
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
653
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
653
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
654
-				OTHER_LDFLAGS = "-ObjC";
654
+				OTHER_LDFLAGS = (
655
+					"-ObjC",
656
+					"-l\"c++\"",
657
+				);
655
 				PRODUCT_NAME = example;
658
 				PRODUCT_NAME = example;
656
 			};
659
 			};
657
 			name = Debug;
660
 			name = Debug;
669
 				INFOPLIST_FILE = example/Info.plist;
672
 				INFOPLIST_FILE = example/Info.plist;
670
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
673
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
671
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
674
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
672
-				OTHER_LDFLAGS = "-ObjC";
675
+				OTHER_LDFLAGS = (
676
+					"-ObjC",
677
+					"-l\"c++\"",
678
+				);
673
 				PRODUCT_NAME = example;
679
 				PRODUCT_NAME = example;
674
 			};
680
 			};
675
 			name = Release;
681
 			name = Release;
716
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
722
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
717
 				MTL_ENABLE_DEBUG_INFO = YES;
723
 				MTL_ENABLE_DEBUG_INFO = YES;
718
 				ONLY_ACTIVE_ARCH = YES;
724
 				ONLY_ACTIVE_ARCH = YES;
725
+				OTHER_LDFLAGS = "";
719
 				SDKROOT = iphoneos;
726
 				SDKROOT = iphoneos;
720
 			};
727
 			};
721
 			name = Debug;
728
 			name = Debug;
755
 				);
762
 				);
756
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
763
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
757
 				MTL_ENABLE_DEBUG_INFO = NO;
764
 				MTL_ENABLE_DEBUG_INFO = NO;
765
+				OTHER_LDFLAGS = "";
758
 				SDKROOT = iphoneos;
766
 				SDKROOT = iphoneos;
759
 				VALIDATE_PRODUCT = YES;
767
 				VALIDATE_PRODUCT = YES;
760
 			};
768
 			};

+ 2
- 1
example/package.json View File

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

+ 3
- 3
example/src/app.js View File

1
-import React, {
1
+import React, {Component} from 'react';
2
+import {
2
   AppRegistry,
3
   AppRegistry,
3
-  Component,
4
   View
4
   View
5
 } from 'react-native';
5
 } from 'react-native';
6
 import { Navigation } from 'react-native-navigation';
6
 import { Navigation } from 'react-native-navigation';
11
 
11
 
12
 AppRegistry.registerComponent('App', () => App);
12
 AppRegistry.registerComponent('App', () => App);
13
 
13
 
14
-export default class App extends React.Component {
14
+export default class App extends Component {
15
   constructor(props) {
15
   constructor(props) {
16
     super(props);
16
     super(props);
17
   }
17
   }

+ 2
- 2
example/src/screens/FirstTabScreen.android.js View File

1
-import React, {
2
-  Component,
1
+import React, {Component} from 'react';
2
+import {
3
   Text,
3
   Text,
4
   View,
4
   View,
5
   ScrollView,
5
   ScrollView,

+ 2
- 2
example/src/screens/FirstTabScreen.ios.js View File

1
-import React, {
2
-  Component,
1
+import React, {Component} from 'react';
2
+import {
3
   Text,
3
   Text,
4
   View,
4
   View,
5
   ScrollView,
5
   ScrollView,

+ 2
- 2
example/src/screens/LightBoxScreen.js View File

1
-import React, {
2
-  Component,
1
+import React, {Component} from 'react';
2
+import {
3
   Text,
3
   Text,
4
   View,
4
   View,
5
   ScrollView,
5
   ScrollView,

+ 2
- 2
example/src/screens/ModalScreen.js View File

1
-import React, {
2
-  Component,
1
+import React, {Component} from 'react';
2
+import {
3
   Text,
3
   Text,
4
   View,
4
   View,
5
   ScrollView,
5
   ScrollView,

+ 2
- 2
example/src/screens/PushedScreen.js View File

1
-import React, {
2
-  Component,
1
+import React, {Component} from 'react';
2
+import {
3
   Text,
3
   Text,
4
   View,
4
   View,
5
   ScrollView,
5
   ScrollView,

+ 2
- 2
example/src/screens/SecondTabScreen.android.js View File

1
-import React, {
2
-  Component,
1
+import React, {Component} from 'react';
2
+import {
3
   Text,
3
   Text,
4
   View,
4
   View,
5
   ScrollView,
5
   ScrollView,

+ 2
- 2
example/src/screens/SecondTabScreen.ios.js View File

1
-import React, {
2
-  Component,
1
+import React, {Component} from 'react';
2
+import {
3
   Text,
3
   Text,
4
   View,
4
   View,
5
   ScrollView,
5
   ScrollView,

+ 2
- 2
example/src/screens/SideMenu.js View File

1
-import React, {
2
-  Component,
1
+import React, {Component} from 'react';
2
+import {
3
   Text,
3
   Text,
4
   View,
4
   View,
5
   ScrollView,
5
   ScrollView,

+ 2
- 2
example/src/screens/StyledScreen.js View File

1
-import React, {
2
-  Component,
1
+import React, {Component} from 'react';
2
+import {
3
   Text,
3
   Text,
4
   View,
4
   View,
5
   ScrollView,
5
   ScrollView,

+ 2
- 2
example/src/screens/ThirdTabScreen.js View File

1
-import React, {
2
-  Component,
1
+import React, {Component} from 'react';
2
+import {
3
   Text,
3
   Text,
4
   View,
4
   View,
5
   ScrollView,
5
   ScrollView,

+ 4
- 3
package.json View File

7
     "type": "git",
7
     "type": "git",
8
     "url": "https://github.com/wix/react-native-navigation.git"
8
     "url": "https://github.com/wix/react-native-navigation.git"
9
   },
9
   },
10
-  "version": "0.2.5",
10
+  "version": "1.0.0",
11
   "description": "React Native Navigation - truly native navigation for iOS and Android",
11
   "description": "React Native Navigation - truly native navigation for iOS and Android",
12
   "nativePackage": true,
12
   "nativePackage": true,
13
   "bugs": {
13
   "bugs": {
18
   "author": "Tal Kol <talkol@gmail.com>",
18
   "author": "Tal Kol <talkol@gmail.com>",
19
   "license": "MIT",
19
   "license": "MIT",
20
   "peerDependencies": {
20
   "peerDependencies": {
21
-    "react-native": ">=0.25.1"
21
+    "react-native": ">=0.25.1",
22
+    "react": ">=0.14.5"
22
   },
23
   },
23
   "dependencies": {
24
   "dependencies": {
24
-    "react-native-controllers": "github:wix/react-native-controllers#upgradeRN25"
25
+    "react-native-controllers": "^2.0.0"
25
   },
26
   },
26
   "optionalDependencies": {
27
   "optionalDependencies": {
27
     "react-redux": "*"
28
     "react-redux": "*"

+ 2
- 1
src/Navigation.js View File

1
-import React, { AppRegistry } from 'react-native';
1
+import React from 'react';
2
+import { AppRegistry } from 'react-native';
2
 import platformSpecific from './platformSpecific';
3
 import platformSpecific from './platformSpecific';
3
 import Screen from './Screen';
4
 import Screen from './Screen';
4
 
5
 

+ 1
- 1
src/Screen.js View File

1
+import React, {Component} from 'react';
1
 import {
2
 import {
2
-  Component,
3
   NativeAppEventEmitter,
3
   NativeAppEventEmitter,
4
   DeviceEventEmitter,
4
   DeviceEventEmitter,
5
   Platform
5
   Platform

+ 3
- 3
src/platformSpecific.android.js View File

1
-import React, {
2
-  AppRegistry,
3
-  Component
1
+import React, {Component} from 'react';
2
+import {
3
+  AppRegistry
4
 } from 'react-native';
4
 } from 'react-native';
5
 
5
 
6
 import Navigation from './Navigation';
6
 import Navigation from './Navigation';