Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport Fixes for react 0.69.X on branch react-native-video 5.2 #2795

Closed
wants to merge 5 commits into from
Closed

Backport Fixes for react 0.69.X on branch react-native-video 5.2 #2795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
847acb7
Use prop types from `deprecated-react-native-prop-types`
renchap Mar 30, 2022
ab8c71f
Update Video.js
Aug 1, 2022
3b01ff8
Replace Image.propTypes with ImagePropTypes.
Aug 1, 2022
3233159
fix(Exoplayer): fix exoplayer version tà 2.13.3
Aug 1, 2022
9bfd806
chore: fix build without exoplayer
Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions Video.js
View file
Open in desktop
@@ -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, ImagePropTypes } from 'deprecated-react-native-prop-types';
import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
import TextTrackType from './TextTrackType';
import FilterType from './FilterType';
Expand Down Expand Up @@ -415,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,
Expand Down
4 changes: 2 additions & 2 deletions android-exoplayer/build.gradle
View file
Open in desktop
Expand Up @@ -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'
}

Expand All @@ -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}'
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
View file
Open in desktop
Expand Up @@ -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'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this?

}
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Expand Up @@ -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"
Expand Down