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.

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

Update fork to 5.0.2 #7

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
2b9ddda
Updated README.md to include instructions for React Native 0.60 and a…
jhalvorson Aug 17, 2019
7a9081d
Removing the call to observeValueForKeyPath:ofObject:change:context: …
Aug 20, 2019
923bc59
Updated CHANGELOG to reflect bug fix in PR 1720
Aug 20, 2019
0a2f7bd
Merge pull request #1715 from jhalvorson/master
CHaNGeTe Sep 8, 2019
9272678
Merge branch 'master' into fix-NSInternalInconsistencyException
CHaNGeTe Sep 8, 2019
f66ca32
Merge pull request #1720 from nmarisi/fix-NSInternalInconsistencyExce…
CHaNGeTe Sep 8, 2019
367031b
5.0.2
Sep 8, 2019
47d5b6f
Make build.gradle to be standalone
marecar3 Apr 18, 2019
a90ff56
replace compileOnly with implementation
marecar3 Apr 18, 2019
c832aef
android x migration
marecar3 Jun 10, 2019
0c912d0
Add gradle files for android-exoplayer
marecar3 Jun 10, 2019
48d51d2
Removed supportLibVersion dependency
marecar3 Jun 10, 2019
a5a62a4
Fixed react-native dependency when there isn't a root project
marecar3 Jun 10, 2019
e22a6fd
Fixed build gradle files
marecar3 Jun 10, 2019
e0a574a
Add maven gradle plugin
hypest Jun 11, 2019
33316cf
Upgrade to exoplayer v2.10.1 with AndroidX support
hypest Jun 12, 2019
2f15854
Revert "Upgrade to exoplayer v2.10.1 with AndroidX support"
hypest Jun 12, 2019
a2f1e8a
Fix compatibility with RN 0.60.0
jtreanor Jul 3, 2019
5e5c10f
Revert "Merge pull request #1 from wordpress-mobile/fix/0.60.0-patch"
jtreanor Jul 5, 2019
b5e4c81
Maven repo is in node_modules when building as an npm dep
hypest Dec 20, 2019
10ac666
Same RN version as gb-mobile
hypest Jan 10, 2020
bcba096
Specific RN version regardless of standalone build or not
hypest Jan 10, 2020
1fdb15b
Remove keymirror dependency
maxme Feb 6, 2020
bfb8119
Remove shaka-player dependency
maxme Feb 6, 2020
77f6d66
Merge branch 'fork-for-gutenberg-mobile' into update_fork_to_5.0.2
SergioEstevao Apr 29, 2020
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## Changelog

### Version 5.0.2
* Fix crash when RCTVideo's superclass doesn't observe the keyPath 'frame' (iOS) [#1720](https://github.com/react-native-community/react-native-video/pull/1720)

### Version 5.0.1
* Fix AndroidX Support bad merge

Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ Then follow the instructions for your platform to link react-native-video into y

#### Standard Method

**React Native 0.60 and above**

Run `pod install` in the `ios` directory. Linking is not required in React Native 0.60 and above.

**React Native 0.59 and below**

Run `react-native link react-native-video` to link the react-native-video library.

#### Using CocoaPods (required to enable caching)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import android.annotation.TargetApi;
import android.content.Context;
import androidx.core.content.ContextCompat;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.SurfaceView;
Expand All @@ -11,6 +10,8 @@
import android.view.ViewGroup;
import android.widget.FrameLayout;

import androidx.core.content.ContextCompat;

import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.ExoPlayer;
Expand Down
2 changes: 0 additions & 2 deletions ios/Video/RCTVideo.m
Original file line number Diff line number Diff line change
Expand Up @@ -712,8 +712,6 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N

return;
}
} else if ([super respondsToSelector:@selector(observeValueForKeyPath:ofObject:change:context:)]) {
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
}
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-video",
"version": "5.0.1",
"version": "5.0.2",
"description": "A <Video /> element for react-native",
"main": "Video.js",
"license": "MIT",
Expand Down