From 961baedb26716b0227f08e9cb94b42853910053c Mon Sep 17 00:00:00 2001 From: Tim Gibadullin Date: Fri, 4 Aug 2017 21:53:53 +0300 Subject: [PATCH 1/3] Replace PropTypes from react with form prop-types package (#677) --- Video.js | 3 ++- package.json | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Video.js b/Video.js index 4d69b333..b90c030e 100644 --- a/Video.js +++ b/Video.js @@ -1,4 +1,5 @@ -import React, {Component, PropTypes} from 'react'; +import React, {Component} from 'react'; +import PropTypes from 'prop-types'; import {StyleSheet, requireNativeComponent, NativeModules, View, Image} from 'react-native'; import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource'; import VideoResizeMode from './VideoResizeMode.js'; diff --git a/package.json b/package.json index fb7bde6e..c69d9b67 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ }, "dependencies": { "keymirror": "0.1.1", + "prop-types": "^15.5.10", "react-native-windows": "0.41.0-rc.0" }, "scripts": { From 573875796635dd5881cf60d48c7d79c694b07605 Mon Sep 17 00:00:00 2001 From: Radek Czemerys Date: Wed, 9 Aug 2017 03:11:11 +0200 Subject: [PATCH 2/3] Remove createJSModules @override - RN 0.47 compatibility (#718) * Remove depreciated createJSModules @ovveride marker * Remove depreciated createJSModules @ovveride marker * Added comment in exoplayer * Added comment * Remove trailing spaces * Fix typo in comment * Fix typo in comment * Fix typo in comment * Fix typo in comment --- .../src/main/java/com/brentvatne/react/ReactVideoPackage.java | 2 +- .../src/main/java/com/brentvatne/react/ReactVideoPackage.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android-exoplayer/src/main/java/com/brentvatne/react/ReactVideoPackage.java b/android-exoplayer/src/main/java/com/brentvatne/react/ReactVideoPackage.java index 18e13bf8..286f972c 100644 --- a/android-exoplayer/src/main/java/com/brentvatne/react/ReactVideoPackage.java +++ b/android-exoplayer/src/main/java/com/brentvatne/react/ReactVideoPackage.java @@ -17,7 +17,7 @@ public class ReactVideoPackage implements ReactPackage { return Collections.emptyList(); } - @Override + // Deprecated RN 0.47 public List> createJSModules() { return Collections.emptyList(); } diff --git a/android/src/main/java/com/brentvatne/react/ReactVideoPackage.java b/android/src/main/java/com/brentvatne/react/ReactVideoPackage.java index 22c48a00..b09e9414 100644 --- a/android/src/main/java/com/brentvatne/react/ReactVideoPackage.java +++ b/android/src/main/java/com/brentvatne/react/ReactVideoPackage.java @@ -18,7 +18,7 @@ public class ReactVideoPackage implements ReactPackage { return Collections.emptyList(); } - @Override + // Deprecated RN 0.47 public List> createJSModules() { return Collections.emptyList(); } From 4ca5956e5836c6377b32e12653b7ebf6fa3528ba Mon Sep 17 00:00:00 2001 From: Mark Miyashita Date: Fri, 11 Aug 2017 09:44:38 -0700 Subject: [PATCH 3/3] Remove react-native-windows as a direct dependency of react-native-video (#730) --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index c69d9b67..da9d9f44 100644 --- a/package.json +++ b/package.json @@ -28,8 +28,7 @@ }, "dependencies": { "keymirror": "0.1.1", - "prop-types": "^15.5.10", - "react-native-windows": "0.41.0-rc.0" + "prop-types": "^15.5.10" }, "scripts": { "test": "node_modules/.bin/eslint *.js"