Skip to content

Commit

Permalink
#101: Update react-native 0.43.0, react 16.0.0-alpha.6 and example ex…
Browse files Browse the repository at this point in the history
…po sdk-16.0.0.
  • Loading branch information
ferrannp committed May 16, 2017
1 parent 8f75241 commit 44e326e
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.DS_Store

# XDE
.exponent/
.expo/

# VSCode
.vscode/
Expand Down
8 changes: 4 additions & 4 deletions example/exp.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"name": "React Native Paper Example",
"description": "Example for React Native Paper",
"slug": "react-native-paper-example",
"sdkVersion": "11.0.0",
"sdkVersion": "16.0.0",
"version": "1.0.0",
"orientation": "default",
"primaryColor": "#cccccc",
"iconUrl": "https://s3.amazonaws.com/exp-brand-assets/ExponentEmptyManifest_192.png",
"icon": "https://s3.amazonaws.com/exp-brand-assets/ExponentEmptyManifest_192.png",
"notification": {
"iconUrl": "https://s3.amazonaws.com/exp-us-standard/placeholder-push-icon-blue-circle.png",
"icon": "https://s3.amazonaws.com/exp-us-standard/placeholder-push-icon-blue-circle.png",
"color": "#000000"
},
"loading": {
"iconUrl": "https://s3.amazonaws.com/exp-brand-assets/ExponentEmptyManifest_192.png",
"icon": "https://s3.amazonaws.com/exp-brand-assets/ExponentEmptyManifest_192.png",
"hideExponentText": false
},
"packagerOpts": {
Expand Down
6 changes: 3 additions & 3 deletions example/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* @flow */

import Exponent from 'exponent';
import Expo from 'expo';
import React, { Component } from 'react';
import {
View,
Expand All @@ -10,7 +10,7 @@ import {
import {
NavigationProvider,
StackNavigation,
} from '@exponent/ex-navigation';
} from '@expo/ex-navigation';
import {
Colors,
Drawer,
Expand Down Expand Up @@ -89,4 +89,4 @@ const styles = StyleSheet.create({
},
});

Exponent.registerRootComponent(App);
Expo.registerRootComponent(App);
11 changes: 5 additions & 6 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@
"private": true,
"main": "main.js",
"dependencies": {
"@exponent/ex-navigation": "^2.0.0",
"@exponent/vector-icons": "^2.0.3",
"exponent": "^11.0.2",
"react": "~15.3.2",
"react-native": "github:exponentjs/react-native#sdk-11.0.3",
"@expo/ex-navigation": "~2.10.0",
"expo": "^16.0.0",
"react": "16.0.0-alpha.6",
"react-native": "github:exponentjs/react-native#sdk-16.0.0",
"react-native-paper": "file:../",
"react-native-vector-icons": "git+https://github.com/exponentjs/react-native-vector-icons.git"
"react-native-vector-icons": "~3.0.0"
}
}
2 changes: 1 addition & 1 deletion example/src/Router.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import React from 'react';
import {
createRouter,
} from '@exponent/ex-navigation';
} from '@expo/ex-navigation';
import ExampleList, { examples } from './ExampleList';

const routes = Object.keys(examples)
Expand Down
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,19 @@
"homepage": "https://github.com/ahmedlhanafy/react-native-paper#readme",
"peerDependencies": {
"react": "*",
"react-native": "*",
"react-native-vector-icons": "*"
"react-native": "*"
},
"devDependencies": {
"@expo/vector-icons": "^4.0.0",
"babel-eslint": "^7.1.0",
"eslint": "^3.9.1",
"eslint-plugin-babel": "^3.3.0",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-react": "^6.6.0",
"eslint-plugin-react-native": "^2.0.0",
"flow-bin": "^0.33.0",
"react": "~15.3.2",
"react-native": "~0.37.0",
"react-native-vector-icons": "~3.0.0"
"react": "~16.0.0-alpha.6",
"react-native": "~0.43.0"
},
"dependencies": {
"color": "^0.11.4",
Expand Down
4 changes: 2 additions & 2 deletions src/components/Icon.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* @flow */

export { default as default } from 'react-native-vector-icons/MaterialIcons';

import { MaterialIcons } from '@expo/vector-icons'
export default MaterialIcons;

0 comments on commit 44e326e

Please sign in to comment.