Merge branch 'master' into ViewPropTypes

index.android.js

@@ -1,6 +1,6 @@
 // @flow
-
+import React, { Component } from 'react';
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
 import { processColor, requireNativeComponent, PointPropType, StyleSheet, View, ViewPropTypes } from 'react-native';
 const deprecatedPropType = require('react-native/Libraries/Utilities/deprecatedPropType.js');
 

index.ios.js

@@ -2,7 +2,8 @@
  * @providesModule LinearGradient
  * @flow
  */
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { processColor, requireNativeComponent, PointPropType, View, ViewPropTypes } from 'react-native';
 const deprecatedPropType = require('react-native/Libraries/Utilities/deprecatedPropType.js');
 

index.js

@@ -0,0 +1,9 @@
+import { Platform } from "react-native";
+import LinearGradientIos from "./index.ios.js";
+import LinearGradientAndroid from "./index.android.js";
+
+const LinearGradient = Platform.OS === "ios"
+  ? LinearGradientIos
+  : LinearGradientAndroid;
+
+export default LinearGradient;

package.json

@@ -24,5 +24,8 @@
   },
   "devDependencies": {
     "jest-cli": "0.2.1"
+  },
+  "dependencies": {
+    "prop-types": "^15.5.10"
   }
 }