Merge branch 'release/0.2.15'

chaimPaneth · Apr 28, 2022 · df420a9 · df420a9
2 parents 689172e + b9ce30a
commit df420a9
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 18 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -49,32 +49,32 @@ allprojects {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    implementation 'com.google.code.gson:gson:2.8.2'
+    implementation 'com.google.code.gson:gson:2.8.9'
 
     // JWPlayer SDK
-    implementation 'com.jwplayer:jwplayer-core:4.4.0'
-    implementation 'com.jwplayer:jwplayer-common:4.4.0'
-    implementation 'com.jwplayer:jwplayer-chromecast:4.4.0'
-    implementation 'com.jwplayer:jwplayer-ima:4.4.0'
+    implementation 'com.jwplayer:jwplayer-core:4.5.1'
+    implementation 'com.jwplayer:jwplayer-common:4.5.1'
+    implementation 'com.jwplayer:jwplayer-chromecast:4.5.1'
+    implementation 'com.jwplayer:jwplayer-ima:4.5.1'
 
     // Ad dependencies
-    implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.24.0'
-    implementation 'com.google.android.gms:play-services-ads-identifier:17.0.1'
-    implementation 'com.google.android.gms:play-services-cast-framework:20.0.0'
+    implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.27.0'
+    implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
+    implementation 'com.google.android.gms:play-services-cast-framework:21.0.1'
 
     // ExoPlayer dependencies
-    implementation 'com.google.android.exoplayer:exoplayer-core:2.14.2'
-    implementation 'com.google.android.exoplayer:exoplayer-dash:2.14.2'
-    implementation 'com.google.android.exoplayer:exoplayer-hls:2.14.2'
-    implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.14.2'
-    implementation 'com.google.android.exoplayer:exoplayer-ui:2.14.2'
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.16.1'
+    implementation 'com.google.android.exoplayer:exoplayer-dash:2.16.1'
+    implementation 'com.google.android.exoplayer:exoplayer-hls:2.16.1'
+    implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.16.1'
+    implementation 'com.google.android.exoplayer:exoplayer-ui:2.16.1'
 
     // JW Player Native UI dependencies
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
-    implementation 'com.android.volley:volley:1.2.0'
+    implementation 'com.android.volley:volley:1.2.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.mediarouter:mediarouter:1.1.0'
-    implementation 'androidx.media:media:1.1.0'
+    implementation 'androidx.mediarouter:mediarouter:1.3.0'
+    implementation 'androidx.media:media:1.6.0'
 }
 
diff --git a/android/src/main/java/com/appgoalz/rnjwplayer/RNJWPlayerView.java b/android/src/main/java/com/appgoalz/rnjwplayer/RNJWPlayerView.java
@@ -715,6 +715,10 @@ private void setupPlayer(ReadableMap prop) {
                 LinearLayout.LayoutParams.MATCH_PARENT));
         addView(mPlayerView);
 
+        if (prop.hasKey("controls")) { // Hack for controls hiding not working right away
+            mPlayerView.getPlayer().setControls(prop.getBoolean("controls"));
+        }
+
         if (prop.hasKey("fullScreenOnLandscape")) {
             fullScreenOnLandscape = prop.getBoolean("fullScreenOnLandscape");
             mPlayerView.fullScreenOnLandscape = fullScreenOnLandscape;

diff --git a/android/src/main/java/com/appgoalz/rnjwplayer/RNJWPlayerViewManager.java b/android/src/main/java/com/appgoalz/rnjwplayer/RNJWPlayerViewManager.java
@@ -48,6 +48,11 @@ public void setConfig(RNJWPlayerView view, ReadableMap prop) {
     view.setConfig(prop);
   }
 
+  @ReactProp(name = "controls")
+  public void setControls(RNJWPlayerView view, Boolean controls) {
+    view.mPlayerView.getPlayer().setControls(controls);
+  }
+
   public Map getExportedCustomBubblingEventTypeConstants() {
     return MapBuilder.builder()
             .put(

diff --git a/ios/RNJWPlayer.podspec b/ios/RNJWPlayer.podspec
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.platform     = :ios, "10.0"
   s.source       = { :git => "https://github.com/chaimPaneth/react-native-jw-media-player.git", :tag => "v#{s.version}" }
   s.source_files  = "RNJWPlayer/*.{h,m}"
-  s.dependency   'JWPlayerKit', '~> 4.5.1'
+  s.dependency   'JWPlayerKit', '~> 4.5.2'
   s.dependency   'google-cast-sdk', '~> 4.7.0'
   s.dependency   'React'
   # s.static_framework = true

diff --git a/ios/RNJWPlayer/RNJWPlayerView.m b/ios/RNJWPlayer/RNJWPlayerView.m
@@ -19,6 +19,8 @@ - (instancetype)init
 
 - (void)dealloc
 {
+    [self reset];
+
     @try {
         [[NSNotificationCenter defaultCenter] removeObserver:self name:UIDeviceOrientationDidChangeNotification object:nil];
         [[NSNotificationCenter defaultCenter] removeObserver:AVAudioSessionInterruptionNotification];

diff --git a/ios/RNJWPlayer/RNJWPlayerViewController.m b/ios/RNJWPlayer/RNJWPlayerViewController.m
@@ -9,6 +9,11 @@
 
 @implementation RNJWPlayerViewController
 
+- (void)dealloc
+{
+    [self.player stop];
+}
+
 -(void)setDelegates
 {
     self.delegate = self;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-jw-media-player",
-  "version": "0.2.14",
+  "version": "0.2.15",
   "description": "React-native Android/iOS plugin for JWPlayer SDK (https://www.jwplayer.com/)",
   "main": "index.js",
   "types": "./index.d.ts",