From 847acb75dcbac9af58141cce4d49f9a972ec4f07 Mon Sep 17 00:00:00 2001 From: Renaud Chaput Date: Wed, 30 Mar 2022 22:36:21 +0200 Subject: [PATCH 1/5] Use prop types from `deprecated-react-native-prop-types` Starting with React Native 0.68, using Prop Types from `react-native` emits a warning. --- Video.js | 3 ++- package.json | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Video.js b/Video.js index b492d48b25..959d0fe7e2 100644 --- a/Video.js +++ b/Video.js @@ -1,6 +1,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { StyleSheet, requireNativeComponent, NativeModules, View, ViewPropTypes, Image, Platform, findNodeHandle } from 'react-native'; +import { StyleSheet, requireNativeComponent, NativeModules, View, Image, Platform, findNodeHandle } from 'react-native'; +import { ViewPropTypes } from "deprecated-react-native-prop-types"; import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource'; import TextTrackType from './TextTrackType'; import FilterType from './FilterType'; diff --git a/package.json b/package.json index cb8d146e89..9dabd081b0 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "react-native-windows": "^0.61.0-0" }, "dependencies": { + "deprecated-react-native-prop-types": "^2.2.0", "keymirror": "^0.1.1", "prop-types": "^15.7.2", "shaka-player": "^2.5.9" From ab8c71fcc544a8f7491c633270dbdaa7f46e6277 Mon Sep 17 00:00:00 2001 From: olivier bouillet Date: Mon, 1 Aug 2022 14:15:35 +0200 Subject: [PATCH 2/5] Update Video.js Co-authored-by: Elliott Kember # Conflicts: # Video.js --- Video.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Video.js b/Video.js index 959d0fe7e2..4f467df813 100644 --- a/Video.js +++ b/Video.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { StyleSheet, requireNativeComponent, NativeModules, View, Image, Platform, findNodeHandle } from 'react-native'; -import { ViewPropTypes } from "deprecated-react-native-prop-types"; +import { ViewPropTypes } from 'deprecated-react-native-prop-types'; import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource'; import TextTrackType from './TextTrackType'; import FilterType from './FilterType'; From 3b01ff875d2475b50d7b87b2c006e4ea34a28fee Mon Sep 17 00:00:00 2001 From: olivier bouillet Date: Mon, 1 Aug 2022 14:19:57 +0200 Subject: [PATCH 3/5] Replace Image.propTypes with ImagePropTypes. # Conflicts: # Video.js --- Video.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Video.js b/Video.js index 4f467df813..a3452ad511 100644 --- a/Video.js +++ b/Video.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { StyleSheet, requireNativeComponent, NativeModules, View, Image, Platform, findNodeHandle } from 'react-native'; -import { ViewPropTypes } from 'deprecated-react-native-prop-types'; +import { ViewPropTypes, ImagePropTypes } from 'deprecated-react-native-prop-types'; import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource'; import TextTrackType from './TextTrackType'; import FilterType from './FilterType'; @@ -416,7 +416,7 @@ Video.propTypes = { maxBitRate: PropTypes.number, resizeMode: PropTypes.string, poster: PropTypes.string, - posterResizeMode: Image.propTypes.resizeMode, + posterResizeMode: ImagePropTypes.resizeMode, repeat: PropTypes.bool, automaticallyWaitsToMinimizeStalling: PropTypes.bool, allowsExternalPlayback: PropTypes.bool, From 32331591339d0752aaa611f4102ed0fa0a7ac6fe Mon Sep 17 00:00:00 2001 From: olivier bouillet Date: Mon, 1 Aug 2022 14:26:03 +0200 Subject: [PATCH 4/5] =?UTF-8?q?fix(Exoplayer):=20fix=20exoplayer=20version?= =?UTF-8?q?=20t=C3=A0=202.13.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android-exoplayer/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android-exoplayer/build.gradle b/android-exoplayer/build.gradle index d005a58f29..6a9922b095 100644 --- a/android-exoplayer/build.gradle +++ b/android-exoplayer/build.gradle @@ -28,7 +28,7 @@ android { dependencies { implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}" - implementation('com.google.android.exoplayer:exoplayer:2.13.2') { + implementation('com.google.android.exoplayer:exoplayer:2.13.3') { exclude group: 'com.android.support' } @@ -37,7 +37,7 @@ dependencies { implementation "androidx.core:core:1.1.0" implementation "androidx.media:media:1.1.0" - implementation('com.google.android.exoplayer:extension-okhttp:2.13.2') { + implementation('com.google.android.exoplayer:extension-okhttp:2.13.3') { exclude group: 'com.squareup.okhttp3', module: 'okhttp' } implementation 'com.squareup.okhttp3:okhttp:${OKHTTP_VERSION}' From 9bfd806f76cab8233c32feea04b1477a72d09aa7 Mon Sep 17 00:00:00 2001 From: olivier bouillet Date: Mon, 1 Aug 2022 14:42:05 +0200 Subject: [PATCH 5/5] chore: fix build without exoplayer --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 2fb8dfd2ac..1c52da9020 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -22,5 +22,5 @@ android { dependencies { //noinspection GradleDynamicVersion implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}" - implementation 'com.yqritc:android-scalablevideoview:1.0.4' + implementation 'com.github.adityaxjha:Android-ScalableVideoView:10e7b4da8b' }