Skip to content

Update fork to 5.2.1 #42

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

Draft
captainCoolMJ wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

Update fork to 5.2.1 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 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
ce03223
v5.2.1
Sep 13, 2022
034e8cf
Merge tag 'v5.2.1' into update
captainCoolMJ Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android-exoplayer/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ android {

dependencies {
implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
implementation('com.google.android.exoplayer:exoplayer:2.15.1') {
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.15.1') {
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
Original file line number Diff line number Diff line change
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'
}
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-video",
"version": "5.2.0",
"version": "5.2.1",
"description": "A <Video /> element for react-native",
"main": "Video.js",
"license": "MIT",
Expand Down Expand Up @@ -38,7 +38,7 @@
"react-native-windows": "^0.61.0-0"
},
"dependencies": {
"deprecated-react-native-prop-types": "2.2.0",
"deprecated-react-native-prop-types": "^2.2.0",
"keymirror": "^0.1.1",
"prop-types": "^15.7.2",
"shaka-player": "^2.5.9"
Expand All @@ -58,4 +58,4 @@
"VideoResizeMode.js",
"react-native-video.podspec"
]
}
}